DEPS

diff --git a/DEPS b/DEPS
index 0c6abc3..53c8a67 100644
--- a/DEPS
+++ b/DEPS
@@ -239,23 +239,23 @@
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling Skia
   # and whatever else without interference from each other.
-  'skia_revision': 'e3c1c4b589a42070c401efd35412ed9ad22a50ea',
+  'skia_revision': '0f2390f7fbb4e83d16d8b8e9768e4157692374c1',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling V8
   # and whatever else without interference from each other.
-  'v8_revision': 'e218afa8473132b56a9e1532be7920dd130aeb7e',
+  'v8_revision': '8a05d7add33e40e73aac9fc43b4d9cce04adeaca',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling ANGLE
   # and whatever else without interference from each other.
-  'angle_revision': '9d5faed87dd8c618a94eca7a9b7b7fbb19fdcccb',
+  'angle_revision': '66e1fb86e935d03558ff2fe355eb0c7e0d89a111',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling SwiftShader
   # and whatever else without interference from each other.
-  'swiftshader_revision': '4c62980da8c1b067c48c2425a206b026eaa38cd4',
+  'swiftshader_revision': 'e03a5db7f8930ff7d1977fac2a8a26abcda59915',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling PDFium
   # and whatever else without interference from each other.
-  'pdfium_revision': '7555375264d234a42305f85d37999d1f8b656099',
+  'pdfium_revision': 'deb48dadd9087b689e23e4af4ad91afeea0d33b0',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling BoringSSL
   # and whatever else without interference from each other.
@@ -306,7 +306,7 @@
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling catapult
   # and whatever else without interference from each other.
-  'catapult_revision': '6abf7c8c4c7fe6098d93a7b7c7208d7130ba8056',
+  'catapult_revision': '70bcf59d8db3665c58b2459222355deb513fb6cb',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling libFuzzer
   # and whatever else without interference from each other.
@@ -314,7 +314,7 @@
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling devtools-frontend
   # and whatever else without interference from each other.
-  'devtools_frontend_revision': '33a7644c91c5c14eb69af944cdadba3f83ebd6f0',
+  'devtools_frontend_revision': 'e0c66bc191719630e8f01c88643e21dc4629f088',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling libprotobuf-mutator
   # and whatever else without interference from each other.
@@ -354,7 +354,7 @@
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling feed
   # and whatever else without interference from each other.
-  'dawn_revision': '5819d52bc450b65a3c4c3d6bd4aa261077539b4c',
+  'dawn_revision': '3b7e75865c1867a3de90e35381b6050c067bee24',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling feed
   # and whatever else without interference from each other.
@@ -799,7 +799,7 @@
     'packages': [
       {
           'package': 'chromium/third_party/androidx',
-          'version': 'g7O7GcLsARLjD0AJbj0PKPchHjuf3xILSH5_7CT3u9wC',
+          'version': 'n_j25o-oyd3wW94UeTR2nYzJ8KGdQcU_jheZYyb3POYC',
       },
     ],
     'condition': 'checkout_android',
@@ -1018,7 +1018,7 @@
   # Tools used when building Chrome for Chrome OS. This affects both the Simple
   # Chrome workflow, as well as the chromeos-chrome ebuild.
   'src/third_party/chromite': {
-      'url': Var('chromium_git') + '/chromiumos/chromite.git' + '@' + 'b006bf3aaf416eb91340184b20376cad8da8b7a4',
+      'url': Var('chromium_git') + '/chromiumos/chromite.git' + '@' + 'f773c1b06736d405d6faeaa07b6d7e2d71530be4',
       'condition': 'checkout_chromeos',
   },
 
@@ -1603,7 +1603,7 @@
   'src/third_party/usrsctp/usrsctplib':
     Var('chromium_git') + '/external/github.com/sctplab/usrsctp' + '@' + '62d7d0c928c9a040dce96aa2f16c00e7e67d59cb',
 
-  'src/third_party/vulkan-deps': '{chromium_git}/vulkan-deps@267fa481ccad51f1b43b98b6d60e0db607f005ca',
+  'src/third_party/vulkan-deps': '{chromium_git}/vulkan-deps@cc2632aa6eaee879147aac7d2950686311d3929b',
 
   'src/third_party/vulkan_memory_allocator':
     Var('chromium_git') + '/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git' + '@' + '5e49f57a6e71a026a54eb42e366de09a4142d24e',
@@ -1700,7 +1700,7 @@
     Var('chromium_git') + '/v8/v8.git' + '@' +  Var('v8_revision'),
 
   'src-internal': {
-    'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@641e5bac9bc25ed53b3edb8a4d8e92a37c207179',
+    'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@41f9fb09d9c72418ced6b80c039e32744ff501ea',
     'condition': 'checkout_src_internal',
   },
 

ash/app_list/views/search_box_view.cc

diff --git a/ash/app_list/views/search_box_view.cc b/ash/app_list/views/search_box_view.cc
index 0d08722..4d2e685 100644
--- a/ash/app_list/views/search_box_view.cc
+++ b/ash/app_list/views/search_box_view.cc
@@ -127,6 +127,7 @@
   // Search box accessible name may change depending on tablet mode state.
   UpdatePlaceholderTextAndAccessibleName();
   UpdateSearchBoxBorder();
+  UpdateBackgroundColor(GetBackgroundColorForState(current_app_list_state_));
 }
 
 void SearchBoxView::ResetForShow() {
@@ -434,7 +435,7 @@
       gfx::Insets(0, horizontal_spacing, 0, horizontal_right_padding));
   box_layout()->set_between_child_spacing(horizontal_spacing);
   InvalidateLayout();
-  current_app_list_state_ = target_state;
+  UpdateBackground(target_state);
 }
 
 int SearchBoxView::GetSearchBoxBorderCornerRadiusForState(

ash/constants/ash_features.cc

diff --git a/ash/constants/ash_features.cc b/ash/constants/ash_features.cc
index 658368a..c2696695 100644
--- a/ash/constants/ash_features.cc
+++ b/ash/constants/ash_features.cc
@@ -700,7 +700,7 @@
 // content and transfer or access it later.
 const base::Feature kHoldingSpaceInProgressDownloadsNotificationSuppression{
     "HoldingSpaceInProgressNotificationSuppression",
-    base::FEATURE_DISABLED_BY_DEFAULT};
+    base::FEATURE_ENABLED_BY_DEFAULT};
 
 // Enables incognito profile integration with the productivity feature that
 // aims to reduce context switching by enabling users to collect content and

ash/public/cpp/cast_config_controller.h

diff --git a/ash/public/cpp/cast_config_controller.h b/ash/public/cpp/cast_config_controller.h
index 1993b33c..e48e5b9 100644
--- a/ash/public/cpp/cast_config_controller.h
+++ b/ash/public/cpp/cast_config_controller.h
@@ -90,6 +90,11 @@
   // to the cast sink.
   virtual bool HasActiveRoute() const = 0;
 
+  // Returns true if access code casting is enabled for this user. This is
+  // important because if it is enabled, the cast icon may need to be shown even
+  // if there are no currently available sinks.
+  virtual bool AccessCodeCastingEnabled() const = 0;
+
   // Request fresh data from the backend. When the data is available, all
   // registered observers will get called.
   virtual void RequestDeviceRefresh() = 0;

ash/public/cpp/system_tray_client.h

diff --git a/ash/public/cpp/system_tray_client.h b/ash/public/cpp/system_tray_client.h
index 2f48ef1b..a54f4d19 100644
--- a/ash/public/cpp/system_tray_client.h
+++ b/ash/public/cpp/system_tray_client.h
@@ -134,6 +134,9 @@
   // effect.
   virtual void SetLocaleAndExit(const std::string& locale_iso_code) = 0;
 
+  // Shows the access code casting dialog.
+  virtual void ShowAccessCodeCastingDialog() = 0;
+
  protected:
   SystemTrayClient() {}
 };

ash/public/cpp/test/test_system_tray_client.cc

diff --git a/ash/public/cpp/test/test_system_tray_client.cc b/ash/public/cpp/test/test_system_tray_client.cc
index 8f27a13f..ddb5bbf 100644
--- a/ash/public/cpp/test/test_system_tray_client.cc
+++ b/ash/public/cpp/test/test_system_tray_client.cc
@@ -99,4 +99,6 @@
 void TestSystemTrayClient::SetLocaleAndExit(
     const std::string& locale_iso_code) {}
 
+void TestSystemTrayClient::ShowAccessCodeCastingDialog() {}
+
 }  // namespace ash

ash/public/cpp/test/test_system_tray_client.h

diff --git a/ash/public/cpp/test/test_system_tray_client.h b/ash/public/cpp/test/test_system_tray_client.h
index 4a1e32c..5a130a0d 100644
--- a/ash/public/cpp/test/test_system_tray_client.h
+++ b/ash/public/cpp/test/test_system_tray_client.h
@@ -58,6 +58,7 @@
   void ShowMultiDeviceSetup() override;
   void RequestRestartForUpdate() override;
   void SetLocaleAndExit(const std::string& locale_iso_code) override;
+  void ShowAccessCodeCastingDialog() override;
 
   int show_bluetooth_settings_count() const {
     return show_bluetooth_settings_count_;

ash/quick_pair/fast_pair_handshake/fast_pair_gatt_service_client_impl.cc

diff --git a/ash/quick_pair/fast_pair_handshake/fast_pair_gatt_service_client_impl.cc b/ash/quick_pair/fast_pair_handshake/fast_pair_gatt_service_client_impl.cc
index d706bf08..1711657f 100644
--- a/ash/quick_pair/fast_pair_handshake/fast_pair_gatt_service_client_impl.cc
+++ b/ash/quick_pair/fast_pair_handshake/fast_pair_gatt_service_client_impl.cc
@@ -124,8 +124,8 @@
     std::unique_ptr<device::BluetoothGattConnection> gatt_connection,
     absl::optional<device::BluetoothDevice::ConnectErrorCode> error_code) {
   if (error_code) {
-    QP_LOG(WARNING) << "Error creating GATT connection to device at address:["
-                    << device_address_ << "].";
+    QP_LOG(WARNING) << "Error creating GATT connection to device due to error: "
+                    << error_code.value();
     NotifyInitializedError(PairFailure::kCreateGattConnection);
   } else {
     QP_LOG(VERBOSE)

ash/system/cast/cast_feature_pod_controller.cc

diff --git a/ash/system/cast/cast_feature_pod_controller.cc b/ash/system/cast/cast_feature_pod_controller.cc
index 33f8f5f37..f8fc43e 100644
--- a/ash/system/cast/cast_feature_pod_controller.cc
+++ b/ash/system/cast/cast_feature_pod_controller.cc
@@ -5,9 +5,11 @@
 #include "ash/system/cast/cast_feature_pod_controller.h"
 
 #include "ash/public/cpp/ash_view_ids.h"
+#include "ash/public/cpp/system_tray_client.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/shell.h"
 #include "ash/strings/grit/ash_strings.h"
+#include "ash/system/model/system_tray_model.h"
 #include "ash/system/unified/feature_pod_button.h"
 #include "ash/system/unified/unified_system_tray_controller.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -44,6 +46,21 @@
 }
 
 void CastFeaturePodController::OnIconPressed() {
+  auto* cast_config = CastConfigController::Get();
+  // If there are no devices currently available for the user, and they have
+  // access code casting available, don't bother displaying an empty list.
+  // Instead, launch directly into the access code UI so that they can begin
+  // casting immediately.
+  if (cast_config && !cast_config->HasSinksAndRoutes() &&
+      cast_config->AccessCodeCastingEnabled()) {
+    Shell::Get()->system_tray_model()->client()->ShowAccessCodeCastingDialog();
+  } else {
+    tray_controller_->ShowCastDetailedView();
+  }
+}
+
+void CastFeaturePodController::OnLabelPressed() {
+  // Clicking on the label should always launch the full UI.
   tray_controller_->ShowCastDetailedView();
 }
 
@@ -58,7 +75,9 @@
 
 void CastFeaturePodController::Update() {
   auto* cast_config = CastConfigController::Get();
-  button_->SetVisible(cast_config && cast_config->HasSinksAndRoutes() &&
+  button_->SetVisible(cast_config &&
+                      (cast_config->HasSinksAndRoutes() ||
+                       cast_config->AccessCodeCastingEnabled()) &&
                       !cast_config->HasActiveRoute());
 }
 

ash/system/cast/cast_feature_pod_controller.h

diff --git a/ash/system/cast/cast_feature_pod_controller.h b/ash/system/cast/cast_feature_pod_controller.h
index 1415fed..7081cee 100644
--- a/ash/system/cast/cast_feature_pod_controller.h
+++ b/ash/system/cast/cast_feature_pod_controller.h
@@ -29,6 +29,7 @@
   // FeaturePodControllerBase:
   FeaturePodButton* CreateButton() override;
   void OnIconPressed() override;
+  void OnLabelPressed() override;
   SystemTrayItemUmaType GetUmaType() const override;
 
   // CastConfigControllerObserver:

ash/system/message_center/unified_message_list_view.h

diff --git a/ash/system/message_center/unified_message_list_view.h b/ash/system/message_center/unified_message_list_view.h
index 66a941d..f92fc8e 100644
--- a/ash/system/message_center/unified_message_list_view.h
+++ b/ash/system/message_center/unified_message_list_view.h
@@ -31,8 +31,8 @@
 class UnifiedMessageCenterView;
 class UnifiedSystemTrayModel;
 
-// It's enclosed. This class is used only from UnifiedMessageCenterView.
 // Manages list of notifications. The class doesn't know about the ScrollView
+// it's enclosed. This class is used only from UnifiedMessageCenterView.
 class ASH_EXPORT UnifiedMessageListView
     : public views::View,
       public message_center::MessageCenterObserver,

ash/webui/projector_app/untrusted_projector_ui.cc

diff --git a/ash/webui/projector_app/untrusted_projector_ui.cc b/ash/webui/projector_app/untrusted_projector_ui.cc
index d8ff0e0d..5271e97 100644
--- a/ash/webui/projector_app/untrusted_projector_ui.cc
+++ b/ash/webui/projector_app/untrusted_projector_ui.cc
@@ -68,25 +68,25 @@
       network::mojom::CSPDirectiveName::StyleSrc,
       "style-src 'self' 'unsafe-inline';");
   source->OverrideContentSecurityPolicy(
-      network::mojom::CSPDirectiveName::ImgSrc,
-      // Allows loading video file thumbnail.
-      "img-src 'self' https://*.googleusercontent.com;");
-  source->OverrideContentSecurityPolicy(
       network::mojom::CSPDirectiveName::MediaSrc,
       // Allows streaming video.
       "media-src 'self' https://*.drive.google.com;");
   // Allow images to also handle data urls.
   source->OverrideContentSecurityPolicy(
       network::mojom::CSPDirectiveName::ImgSrc,
-      "img-src blob: data: 'self' https://*.drive.google.com;");
+      "img-src blob: data: 'self' https://*.googleusercontent.com;");
   source->OverrideContentSecurityPolicy(
       network::mojom::CSPDirectiveName::ConnectSrc,
       "connect-src 'self' https://www.googleapis.com "
       "https://drive.google.com;");
 
+  // TODO(b/210064058): COEP is conflicting with loading cross origin resources.
+  // Comment out COEP overrides for now until the issue is resolved. If we
+  // decided to create a separate origin for annotator, we need to also clean up
+  // the ink resources and WASM related policy overrides.
   // Allow use of SharedArrayBuffer (required by the wasm).
-  source->OverrideCrossOriginOpenerPolicy("same-origin");
-  source->OverrideCrossOriginEmbedderPolicy("require-corp");
+  // source->OverrideCrossOriginOpenerPolicy("same-origin");
+  // source->OverrideCrossOriginEmbedderPolicy("require-corp");
 
   // TODO(b/197120695): re-enable trusted type after fixing the issue that icon
   // template is setting innerHTML.

ash/webui/shimless_rma/resources/reimaging_firmware_update_page.js

diff --git a/ash/webui/shimless_rma/resources/reimaging_firmware_update_page.js b/ash/webui/shimless_rma/resources/reimaging_firmware_update_page.js
index f3a7524..335ffe0 100644
--- a/ash/webui/shimless_rma/resources/reimaging_firmware_update_page.js
+++ b/ash/webui/shimless_rma/resources/reimaging_firmware_update_page.js
@@ -59,7 +59,7 @@
       /** @protected */
       statusString_: {
         type: String,
-        computed: 'getStatusString_(status_)',
+        computed: 'computeStatusString_(status_)',
       },
     };
   }
@@ -84,7 +84,7 @@
    * @protected
    * @return {string}
    */
-  getStatusString_() {
+  computeStatusString_() {
     // kDownloading state is not used in V1.
     if (!this.status_ || this.status_ == UpdateRoFirmwareStatus.kDownloading) {
       return '';

ash/webui/shimless_rma/shimless_rma.cc

diff --git a/ash/webui/shimless_rma/shimless_rma.cc b/ash/webui/shimless_rma/shimless_rma.cc
index 0d2de809..c913684d 100644
--- a/ash/webui/shimless_rma/shimless_rma.cc
+++ b/ash/webui/shimless_rma/shimless_rma.cc
@@ -251,7 +251,8 @@
       // Firmware reimaging page
       {"firmwareUpdatePageTitleText", IDS_SHIMLESS_RMA_FIRMWARE_UPDATE_TITLE},
       {"firmwareUpdateWaitForUsbText", IDS_SHIMLESS_RMA_FIRMWARE_WAIT_FOR_USB},
-      {"firmwareUpdateFileNotFoundText", IDS_SHIMLESS_RMA_FIRMWARE_NOT_FOUND},
+      {"firmwareUpdateFileNotFoundText",
+       IDS_SHIMLESS_RMA_FIRMWARE_FILE_NOT_FOUND},
       {"firmwareUpdatingText", IDS_SHIMLESS_RMA_FIRMWARE_UPDATING},
       {"firmwareUpdateRebootText", IDS_SHIMLESS_RMA_FIRMWARE_REBOOT},
       {"firmwareUpdateCompleteText", IDS_SHIMLESS_RMA_FIRMWARE_UPDATE_COMPLETE},

ash/wm/desks/desk_mini_view.cc

diff --git a/ash/wm/desks/desk_mini_view.cc b/ash/wm/desks/desk_mini_view.cc
index ff8513c..53d5d90 100644
--- a/ash/wm/desks/desk_mini_view.cc
+++ b/ash/wm/desks/desk_mini_view.cc
@@ -457,7 +457,11 @@
 bool DeskMiniView::IsPointOnMiniView(const gfx::Point& screen_location) const {
   gfx::Point point_in_view = screen_location;
   ConvertPointFromScreen(this, &point_in_view);
-  return HitTestPoint(point_in_view);
+  // `this` doesn't have access to its widget until it's added to the view's
+  // hierarchy, however this function could be triggered during the constructor
+  // of `DeskMiniView` when it's not added to the view's hierarchy yet. Thus we
+  // need to check whether the widget if accessible here.
+  return GetWidget() && HitTestPoint(point_in_view);
 }
 
 void DeskMiniView::OnCloseButtonPressed() {

ash/wm/desks/desks_bar_view.cc

diff --git a/ash/wm/desks/desks_bar_view.cc b/ash/wm/desks/desks_bar_view.cc
index 607dccf..b5c4752 100644
--- a/ash/wm/desks/desks_bar_view.cc
+++ b/ash/wm/desks/desks_bar_view.cc
@@ -980,6 +980,28 @@
   return nullptr;
 }
 
+void DesksBarView::SwitchToZeroState() {
+  // Hiding the button immediately instead of the ends of the animation while
+  // switching from expanded state to zero state.
+  if (vertical_dots_button_)
+    vertical_dots_button_->SetVisible(false);
+
+  // In zero state, if the only desk is being dragged, we should end dragging.
+  // Because the dragged desk's mini view is removed, the mouse released or
+  // gesture ended events cannot be received. |drag_view_| will keep the stale
+  // reference of removed mini view and |drag_proxy_| will not be reset.
+  if (drag_view_)
+    EndDragDesk(drag_view_, /*end_by_user=*/false);
+
+  std::vector<DeskMiniView*> removed_mini_views = mini_views_;
+  mini_views_.clear();
+
+  // Keep current layout until the animation is completed since the animation
+  // for going back to zero state is based on the expanded bar's current
+  // layout.
+  PerformExpandedStateToZeroStateMiniViewAnimation(this, removed_mini_views);
+}
+
 int DesksBarView::DetermineMoveIndex(int location_screen_x) const {
   const int views_size = static_cast<int>(mini_views_.size());
 
@@ -1178,28 +1200,6 @@
   overview_grid_->overview_session()->ShowDesksTemplatesGrids(IsZeroState());
 }
 
-void DesksBarView::SwitchToZeroState() {
-  // Hiding the button immediately instead of the ends of the animation while
-  // switching from expanded state to zero state.
-  if (vertical_dots_button_)
-    vertical_dots_button_->SetVisible(false);
-
-  // In zero state, if the only desk is being dragged, we should end dragging.
-  // Because the dragged desk's mini view is removed, the mouse released or
-  // gesture ended events cannot be received. |drag_view_| will keep the stale
-  // reference of removed mini view and |drag_proxy_| will not be reset.
-  if (drag_view_)
-    EndDragDesk(drag_view_, /*end_by_user=*/false);
-
-  std::vector<DeskMiniView*> removed_mini_views = mini_views_;
-  mini_views_.clear();
-
-  // Keep current layout until the animation is completed since the animation
-  // for going back to zero state is based on the expanded bar's current
-  // layout.
-  PerformExpandedStateToZeroStateMiniViewAnimation(this, removed_mini_views);
-}
-
 void DesksBarView::OnContentsScrolled() {
   UpdateScrollButtonsVisibility();
   UpdateGradientZone();

ash/wm/desks/desks_bar_view.h

diff --git a/ash/wm/desks/desks_bar_view.h b/ash/wm/desks/desks_bar_view.h
index f9bb609d..a2e34f9 100644
--- a/ash/wm/desks/desks_bar_view.h
+++ b/ash/wm/desks/desks_bar_view.h
@@ -206,6 +206,9 @@
   // has been created for it yet.
   DeskMiniView* FindMiniViewForDesk(const Desk* desk) const;
 
+  // Animates the bar from expanded state to zero state. Clears `mini_views_`.
+  void SwitchToZeroState();
+
  private:
   friend class DesksBarScrollViewLayout;
   friend class DesksTestApi;
@@ -253,9 +256,6 @@
 
   void OnDesksTemplatesButtonPressed();
 
-  // Animates the bar from expanded state to zero state. Clears `mini_views_`.
-  void SwitchToZeroState();
-
   // Scrollview callbacks.
   void OnContentsScrolled();
   void OnContentsScrollEnded();

ash/wm/desks/desks_unittests.cc

diff --git a/ash/wm/desks/desks_unittests.cc b/ash/wm/desks/desks_unittests.cc
index 7cc82008..3bd5bcf 100644
--- a/ash/wm/desks/desks_unittests.cc
+++ b/ash/wm/desks/desks_unittests.cc
@@ -104,6 +104,9 @@
 #include "ui/events/event_constants.h"
 #include "ui/events/gesture_detection/gesture_configuration.h"
 #include "ui/events/test/event_generator.h"
+#include "ui/gfx/geometry/point.h"
+#include "ui/gfx/geometry/point_conversions.h"
+#include "ui/gfx/geometry/point_f.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/widget/widget.h"
@@ -6564,14 +6567,31 @@
   EXPECT_TRUE(zero_state_new_desk_button->GetVisible());
   EXPECT_FALSE(desks_bar_view->expanded_state_new_desk_button()->GetVisible());
 
-  auto* overview_session = overview_controller->overview_session();
-  auto* overview_item1 = overview_session->GetOverviewItemForWindow(win1.get());
+  auto* overview_item1 = overview_grid->GetOverviewItemContaining(win1.get());
   auto* event_generator = GetEventGenerator();
 
-  // Start dragging |overview_item1| without dropping it. This will lead
-  // |desks_bar_view| changing from zero state to expanded state.
+  // Start dragging `overview_item1` without dropping it. Make sure the square
+  // length between `overview_item1` and `zero_state_new_desk_button` is longer
+  // than `kExpandDesksBarThreshold`. Verify that the desks bar is still at zero
+  // state in this use case.
+  DragItemToPoint(
+      overview_item1,
+      gfx::ToRoundedPoint(overview_item1->target_bounds().CenterPoint() +
+                          gfx::Vector2d(100, -100)),
+      event_generator,
+      /*by_touch_gestures=*/false, /*drop=*/false);
+  EXPECT_TRUE(zero_state_default_desk_button->GetVisible());
+  EXPECT_TRUE(zero_state_new_desk_button->GetVisible());
+  EXPECT_FALSE(desks_bar_view->expanded_state_new_desk_button()->GetVisible());
+
+  // Now keep dragging `overview_item1` and make it close enough to the center
+  // point of `zero_state_new_desk_button`. Verify that desks bar is transformed
+  // to the expanded state in this use case.
+  const gfx::Point new_desk_button_center_point =
+      zero_state_new_desk_button->GetBoundsInScreen().CenterPoint();
   DragItemToPoint(overview_item1,
-                  zero_state_new_desk_button->GetBoundsInScreen().CenterPoint(),
+                  gfx::Point(new_desk_button_center_point.x() + 10,
+                             new_desk_button_center_point.y() + 10),
                   event_generator, /*by_touch_gestures=*/false, /*drop=*/false);
   EXPECT_FALSE(zero_state_default_desk_button->GetVisible());
   EXPECT_FALSE(zero_state_new_desk_button->GetVisible());
@@ -6584,8 +6604,8 @@
   EXPECT_EQ(2u, desks_bar_view->mini_views().size());
   EXPECT_EQ(2u, controller->desks().size());
   EXPECT_TRUE(base::Contains(controller->desks()[1]->windows(), win1.get()));
-  // The active desk should still be the first desk, even though a new desk is
-  // created.
+  // The active desk should still be the first desk, even though a new desk
+  // is created.
   EXPECT_EQ(DesksController::Get()->active_desk(),
             controller->desks()[0].get());
   // |overview_grid| should have size equals to 0 now, since |overview_item1|
@@ -6593,6 +6613,66 @@
   EXPECT_EQ(0u, overview_grid->size());
 }
 
+// Tests that dragging a window at zero state, when the window being dragged is
+// close enough to the new desk button, desks bar should be transformed to
+// expanded state. In the end, if the window is not dropped on the new desk,
+// desk bar will be transformed back to zero state once the drag is completed.
+TEST_F(DragWindowToNewDeskTest,
+       DragWindowAtZeroStateWithoutDroppingItOnTheNewDesk) {
+  auto* controller = DesksController::Get();
+  auto win1 = CreateAppWindow(gfx::Rect(0, 0, 250, 100));
+
+  ASSERT_EQ(1u, controller->desks().size());
+  auto* overview_controller = Shell::Get()->overview_controller();
+  EnterOverview();
+
+  ASSERT_TRUE(overview_controller->InOverviewSession());
+  auto* overview_grid = GetOverviewGridForRoot(Shell::GetPrimaryRootWindow());
+  const auto* desks_bar_view = overview_grid->desks_bar_view();
+  ASSERT_TRUE(desks_bar_view);
+
+  // Make sure the desks bar is at zero state in the beginning.
+  auto* zero_state_default_desk_button =
+      desks_bar_view->zero_state_default_desk_button();
+  auto* zero_state_new_desk_button =
+      desks_bar_view->zero_state_new_desk_button();
+  auto* expanded_state_new_desk_button =
+      desks_bar_view->expanded_state_new_desk_button();
+  EXPECT_TRUE(zero_state_default_desk_button->GetVisible());
+  EXPECT_TRUE(zero_state_new_desk_button->GetVisible());
+  EXPECT_FALSE(expanded_state_new_desk_button->GetVisible());
+
+  auto* overview_item1 = overview_grid->GetOverviewItemContaining(win1.get());
+  auto* event_generator = GetEventGenerator();
+
+  // Drag `overview_item1` and make it close enough to the center point of
+  // `zero_state_new_desk_button`. Verify that desks bar is transformed to the
+  // expanded state in this use case.
+  const gfx::Point new_desk_button_center_point =
+      zero_state_new_desk_button->GetBoundsInScreen().CenterPoint();
+  DragItemToPoint(overview_item1,
+                  gfx::Point(new_desk_button_center_point.x() + 10,
+                             new_desk_button_center_point.y() + 10),
+                  event_generator, /*by_touch_gestures=*/false, /*drop=*/false);
+  EXPECT_FALSE(zero_state_default_desk_button->GetVisible());
+  EXPECT_FALSE(zero_state_new_desk_button->GetVisible());
+  EXPECT_TRUE(expanded_state_new_desk_button->GetVisible());
+
+  // Now keep dragging `overview_item1` and make it not able to be dropped on
+  // the new desk, then drop it. Check that `overview_item1` is dropped back to
+  // the existing desk, there's no new desk created, and desks bar is
+  // transformed back to the zero state.
+  const gfx::Point expanded_new_desk_button_center_point =
+      expanded_state_new_desk_button->GetBoundsInScreen().CenterPoint();
+  DragItemToPoint(overview_item1,
+                  gfx::Point(expanded_new_desk_button_center_point.x() + 200,
+                             expanded_new_desk_button_center_point.y() + 200),
+                  event_generator, /*by_touch_gestures=*/false, /*drop=*/true);
+  EXPECT_TRUE(desks_bar_view->IsZeroState());
+  EXPECT_EQ(1u, controller->desks().size());
+  EXPECT_TRUE(base::Contains(controller->desks()[0]->windows(), win1.get()));
+}
+
 // Tests that dragging and dropping window to new desk while desks bar view is
 // at expanded state.
 TEST_F(DragWindowToNewDeskTest, DragWindowAtExpandedState) {

ash/wm/overview/overview_grid.cc

diff --git a/ash/wm/overview/overview_grid.cc b/ash/wm/overview/overview_grid.cc
index cb91b54..c28ecac9 100644
--- a/ash/wm/overview/overview_grid.cc
+++ b/ash/wm/overview/overview_grid.cc
@@ -40,6 +40,7 @@
 #include "ash/wm/desks/templates/desks_templates_name_view.h"
 #include "ash/wm/desks/templates/desks_templates_presenter.h"
 #include "ash/wm/desks/templates/desks_templates_util.h"
+#include "ash/wm/desks/zero_state_button.h"
 #include "ash/wm/mru_window_tracker.h"
 #include "ash/wm/overview/cleanup_animation_observer.h"
 #include "ash/wm/overview/drop_target_view.h"
@@ -114,6 +115,13 @@
 
 constexpr int kTabletModeOverviewItemTopPaddingDp = 16;
 
+// The threshold for expanding desks bar while dragging the window. When the
+// length between the center point of the window being dragged and the center
+// point of the `zero_state_new_desk_button_` is smaller than
+// `kExpandDesksBarThreshold`, desks bar will be transformed from zero state to
+// expanded state to help user dropping the dragged window on the new desk.
+constexpr int kExpandDesksBarThreshold = 130;
+
 // Wait a while before unpausing the occlusion tracker after a scroll has
 // completed as the user may start another scroll.
 constexpr base::TimeDelta kOcclusionUnpauseDurationForScroll =
@@ -1468,10 +1476,25 @@
       DesksMoveWindowFromActiveDeskSource::kDragAndDrop);
 }
 
-void OverviewGrid::MaybeExpandDesksBarView() {
+void OverviewGrid::MaybeExpandDesksBarView(const gfx::PointF& screen_location) {
   if (desks_bar_view_ && desks_bar_view_->IsZeroState()) {
-    desks_bar_view_->UpdateNewMiniViews(/*initializing_bar_view=*/false,
-                                        /*expanding_bar_view=*/true);
+    if ((gfx::ToRoundedPoint(screen_location) -
+         desks_bar_view_->zero_state_new_desk_button()
+             ->GetBoundsInScreen()
+             .CenterPoint())
+            .LengthSquared() <=
+        kExpandDesksBarThreshold * kExpandDesksBarThreshold) {
+      desks_bar_view_->UpdateNewMiniViews(/*initializing_bar_view=*/false,
+                                          /*expanding_bar_view=*/true);
+    }
+  }
+}
+
+void OverviewGrid::MaybeShrinkDesksBarView() {
+  if (desks_bar_view_ && !desks_bar_view_->IsZeroState() &&
+      !IsShowingDesksTemplatesGrid() &&
+      desks_bar_view_->mini_views().size() == 1) {
+    desks_bar_view_->SwitchToZeroState();
   }
 }
 

ash/wm/overview/overview_grid.h

diff --git a/ash/wm/overview/overview_grid.h b/ash/wm/overview/overview_grid.h
index 304ca2ee..491673f 100644
--- a/ash/wm/overview/overview_grid.h
+++ b/ash/wm/overview/overview_grid.h
@@ -295,10 +295,15 @@
       const gfx::Point& screen_location,
       OverviewItem* drag_item);
 
-  // Updates |desks_bar_views| from zero state to expanded state. Called when a
-  // normal drag starts to enable user dragging a window and dropping it to the
-  // new desk.
-  void MaybeExpandDesksBarView();
+  // Transforms `desks_bar_view_` from zero state to expanded state. Called when
+  // a normal drag starts to enable user dragging a window and dropping it to
+  // the new desk. `screen_location` is the center point of the window being
+  // dragged.
+  void MaybeExpandDesksBarView(const gfx::PointF& screen_location);
+
+  // Transforms `desks_bar_view_` from expanded state to zero state. Called when
+  // a normal drag is completed.
+  void MaybeShrinkDesksBarView();
 
   // Prepares the |scroll_offset_min_| as a limit for |scroll_offset| from
   // scrolling or positioning windows too far offscreen.
@@ -311,7 +316,7 @@
 
   void EndScroll();
 
-  // Calculate the width of an item based on |height|. The width tries to keep
+  // Calculates the width of an item based on |height|. The width tries to keep
   // the same aspect ratio as the original window, but may be modified if the
   // bounds of the window are considered extreme, or if the window is in
   // splitview or entering splitview.
@@ -373,7 +378,7 @@
   size_t size() const { return window_list_.size(); }
 
   // Returns the root window in which the grid displays the windows.
-  const aura::Window* root_window() const { return root_window_; }
+  aura::Window* root_window() { return root_window_; }
 
   OverviewSession* overview_session() { return overview_session_; }
 

ash/wm/overview/overview_window_drag_controller.cc

diff --git a/ash/wm/overview/overview_window_drag_controller.cc b/ash/wm/overview/overview_window_drag_controller.cc
index d3e2e17..92397209 100644
--- a/ash/wm/overview/overview_window_drag_controller.cc
+++ b/ash/wm/overview/overview_window_drag_controller.cc
@@ -99,8 +99,14 @@
   const DesksBarView* desks_bar_view = overview_grid->desks_bar_view();
   DCHECK(desks_bar_view);
 
-  const float scale_factor = static_cast<float>(desks_bar_view->height()) /
-                             overview_grid->root_window()->bounds().height();
+  // We should always use the expanded desks bar height here even if the desks
+  // bar is actually in zero state to calculate `scale_factor`. Because if zero
+  // state bar height is used here, the dragged window could become too small
+  // during the drag.
+  const float scale_factor =
+      static_cast<float>(
+          DesksBarView::GetExpandedBarHeight(overview_grid->root_window())) /
+      overview_grid->root_window()->bounds().height();
   gfx::SizeF scaled_size = gfx::ScaleSize(window_original_size, scale_factor);
   // Add the margins overview mode adds around the window's contents.
   scaled_size.Enlarge(2 * kWindowMargin, 2 * kWindowMargin + kHeaderHeightDp);
@@ -299,10 +305,6 @@
       OVERVIEW_ANIMATION_LAYOUT_OVERVIEW_ITEMS_IN_OVERVIEW);
   original_scaled_size_ = item_->target_bounds().size();
   auto* overview_grid = item_->overview_grid();
-  // We need to transform desks bar view to expanded state if it's at zero state
-  // when dragging starts and if `kDragWindowToNewDesk` is enabled.
-  if (features::IsDragWindowToNewDeskEnabled())
-    overview_grid->MaybeExpandDesksBarView();
   overview_grid->AddDropTargetForDraggingFromThisGrid(item_);
 
   if (should_allow_split_view_) {
@@ -348,6 +350,10 @@
           GetItemSizeWhenOnDesksBar(grid.get(), window_original_size);
       grid_desks_bar_data.desks_bar_bounds = grid_desks_bar_data.shrink_bounds =
           gfx::RectF(grid->desks_bar_view()->GetBoundsInScreen());
+      const int expanded_height =
+          DesksBarView::GetExpandedBarHeight(grid->root_window());
+      grid_desks_bar_data.desks_bar_bounds.set_height(expanded_height);
+      grid_desks_bar_data.shrink_bounds.set_height(expanded_height);
       grid_desks_bar_data.shrink_bounds.Inset(
           -item_no_header_size.width() / 2, -item_no_header_size.height() / 2);
       grid_desks_bar_data.shrink_region_distance =
@@ -514,9 +520,17 @@
   gfx::PointF centerpoint =
       location_in_screen - (initial_event_location_ - initial_centerpoint_);
 
+  auto* overview_grid = GetCurrentGrid();
+
+  // We may need to transform desks bar from zero state to expanded state if
+  // `kDragWindowToNewDesk` is enabled while dragging continues and the square
+  // length between the window being dragged and new desk button reaches
+  // `kExpandDesksBarThreshold`.
+  if (features::IsDragWindowToNewDeskEnabled())
+    overview_grid->MaybeExpandDesksBarView(location_in_screen);
+
   // If virtual desks is enabled, we want to gradually shrink the dragged item
   // as it gets closer to get dropped into a desk mini view.
-  auto* overview_grid = GetCurrentGrid();
   if (virtual_desks_bar_enabled_) {
     // TODO(sammiequon): There is a slight jump especially if we drag from the
     // corner of a larger overview item, but this is necessary for the time
@@ -663,6 +677,11 @@
     // Overview grid will be updated after window is snapped in splitview.
     SnapWindow(SplitViewController::Get(target_root), snap_position_);
     RecordNormalDrag(kToSnap, is_dragged_to_other_display);
+    // When there's only one window and it's snapped, overview mode will be
+    // ended. Thus we need to check whether `overview_session_` is being
+    // shutting down or not here before triggering `MaybeShrinkDesksBarView`.
+    if (!overview_session_->is_shutting_down())
+      current_grid->MaybeShrinkDesksBarView();
     return DragResult::kSnap;
   }
 
@@ -701,6 +720,7 @@
   } else {
     item_->set_should_restack_on_animation_end(true);
     overview_session_->PositionWindows(/*animate=*/true);
+    current_grid->MaybeShrinkDesksBarView();
   }
   RecordNormalDrag(kToGrid, is_dragged_to_other_display);
   return DragResult::kDropIntoOverview;

cc/BUILD.gn

diff --git a/cc/BUILD.gn b/cc/BUILD.gn
index 60572d95..bf49b84 100644
--- a/cc/BUILD.gn
+++ b/cc/BUILD.gn
@@ -730,6 +730,7 @@
     "metrics/compositor_timing_history_unittest.cc",
     "metrics/dropped_frame_counter_unittest.cc",
     "metrics/events_metrics_manager_unittest.cc",
+    "metrics/frame_info_unittest.cc",
     "metrics/frame_sequence_metrics_unittest.cc",
     "metrics/frame_sequence_tracker_unittest.cc",
     "metrics/frame_sorter_unittest.cc",

cc/animation/animation_host.cc

diff --git a/cc/animation/animation_host.cc b/cc/animation/animation_host.cc
index 509cf983..1862c63 100644
--- a/cc/animation/animation_host.cc
+++ b/cc/animation/animation_host.cc
@@ -258,27 +258,27 @@
 }
 
 void AnimationHost::SetMutatorHostClient(MutatorHostClient* client) {
-  if (mutator_host_client_ == client)
+  if (mutator_host_client() == client)
     return;
 
   mutator_host_client_ = client;
-  if (mutator_host_client_ && needs_push_properties_)
-    mutator_host_client_->SetMutatorsNeedCommit();
+  if (mutator_host_client() && needs_push_properties_)
+    mutator_host_client()->SetMutatorsNeedCommit();
 }
 
 void AnimationHost::SetNeedsCommit() {
-  DCHECK(mutator_host_client_);
-  mutator_host_client_->SetMutatorsNeedCommit();
+  DCHECK(mutator_host_client());
+  mutator_host_client()->SetMutatorsNeedCommit();
   // TODO(loyso): Invalidate property trees only if really needed.
-  mutator_host_client_->SetMutatorsNeedRebuildPropertyTrees();
+  mutator_host_client()->SetMutatorsNeedRebuildPropertyTrees();
 }
 
 void AnimationHost::SetNeedsPushProperties() {
   if (needs_push_properties_)
     return;
   needs_push_properties_ = true;
-  if (mutator_host_client_)
-    mutator_host_client_->SetMutatorsNeedCommit();
+  if (mutator_host_client())
+    mutator_host_client()->SetMutatorsNeedCommit();
 }
 
 void AnimationHost::PushPropertiesTo(MutatorHost* mutator_host_impl,
@@ -412,8 +412,8 @@
   auto on_done = base::BindOnce(
       [](base::WeakPtr<AnimationHost> animation_host, ElementListType tree_type,
          MutateStatus status) {
-        if (animation_host->mutator_host_client_) {
-          animation_host->mutator_host_client_
+        if (animation_host->mutator_host_client()) {
+          animation_host->mutator_host_client()
               ->NotifyAnimationWorkletStateChange(
                   ToAnimationWorkletMutationState(status), tree_type);
         }
@@ -425,7 +425,7 @@
                      : MutateQueuingStrategy::kQueueHighPriority;
   if (mutator_->Mutate(std::move(state), queuing_strategy,
                        std::move(on_done))) {
-    mutator_host_client_->NotifyAnimationWorkletStateChange(
+    mutator_host_client()->NotifyAnimationWorkletStateChange(
         AnimationWorkletMutationState::STARTED, tree_type);
   }
   return;

cc/animation/animation_host.h

diff --git a/cc/animation/animation_host.h b/cc/animation/animation_host.h
index 027d822..94194351 100644
--- a/cc/animation/animation_host.h
+++ b/cc/animation/animation_host.h
@@ -73,8 +73,14 @@
   gfx::PointF GetScrollOffsetForAnimation(ElementId element_id) const;
 
   // Parent LayerTreeHost or LayerTreeHostImpl.
-  MutatorHostClient* mutator_host_client() { return mutator_host_client_; }
+  MutatorHostClient* mutator_host_client() {
+    DCHECK(!mutator_host_client_ ||
+           mutator_host_client_->RunsOnCurrentThread());
+    return mutator_host_client_;
+  }
   const MutatorHostClient* mutator_host_client() const {
+    DCHECK(!mutator_host_client_ ||
+           mutator_host_client_->RunsOnCurrentThread());
     return mutator_host_client_;
   }
 

cc/layers/layer.cc

diff --git a/cc/layers/layer.cc b/cc/layers/layer.cc
index b2147af..1cfc34d0 100644
--- a/cc/layers/layer.cc
+++ b/cc/layers/layer.cc
@@ -138,7 +138,7 @@
 }
 
 Layer::LayerTreeInputs& Layer::EnsureLayerTreeInputs() {
-  DCHECK(!layer_tree_host_ || !layer_tree_host_->IsUsingLayerLists());
+  DCHECK(!IsAttached() || !IsUsingLayerLists());
   if (!layer_tree_inputs_)
     layer_tree_inputs_ = std::make_unique<LayerTreeInputs>();
   return *layer_tree_inputs_;
@@ -146,23 +146,23 @@
 
 #if DCHECK_IS_ON()
 const Layer::LayerTreeInputs* Layer::layer_tree_inputs() const {
-  DCHECK(!layer_tree_host_ || !layer_tree_host_->IsUsingLayerLists());
+  DCHECK(!IsAttached() || !IsUsingLayerLists());
   return layer_tree_inputs_.get();
 }
 #endif
 
 void Layer::SetLayerTreeHost(LayerTreeHost* host) {
   DCHECK(IsPropertyChangeAllowed());
-  if (layer_tree_host_ == host)
+  if (layer_tree_host() == host)
     return;
 
   bool property_tree_indices_invalid = false;
-  if (layer_tree_host_) {
-    layer_tree_host_->UnregisterLayer(this);
+  if (IsAttached()) {
+    layer_tree_host()->UnregisterLayer(this);
     if (inputs_.element_id)
-      layer_tree_host_->UnregisterElement(inputs_.element_id);
-    if (!layer_tree_host_->IsUsingLayerLists()) {
-      layer_tree_host_->property_trees()->needs_rebuild = true;
+      layer_tree_host()->UnregisterElement(inputs_.element_id);
+    if (!IsUsingLayerLists()) {
+      layer_tree_host()->property_trees()->needs_rebuild = true;
       property_tree_indices_invalid = true;
     }
   }
@@ -195,7 +195,7 @@
 }
 
 void Layer::SetNeedsCommit() {
-  if (!layer_tree_host_)
+  if (!IsAttached())
     return;
 
   SetNeedsPushProperties();
@@ -203,7 +203,7 @@
   if (ignore_set_needs_commit_)
     return;
 
-  layer_tree_host_->SetNeedsCommit();
+  layer_tree_host()->SetNeedsCommit();
 }
 
 void Layer::SetDebugName(const std::string& name) {
@@ -213,27 +213,31 @@
 }
 
 void Layer::SetNeedsFullTreeSync() {
-  if (!layer_tree_host_)
+  if (!IsAttached())
     return;
 
-  layer_tree_host_->SetNeedsFullTreeSync();
+  layer_tree_host()->SetNeedsFullTreeSync();
 }
 
 void Layer::SetNeedsPushProperties() {
-  if (layer_tree_host_)
-    layer_tree_host_->AddLayerShouldPushProperties(this);
+  if (IsAttached())
+    layer_tree_host()->AddLayerShouldPushProperties(this);
 }
 
 bool Layer::IsPropertyChangeAllowed() const {
-  if (!layer_tree_host_)
+  if (!IsAttached())
     return true;
+  DCHECK(IsMainThread());
 
-  return !layer_tree_host_->in_paint_layer_contents() &&
-         !layer_tree_host_->in_commit();
+  return !layer_tree_host()->in_paint_layer_contents() &&
+         !layer_tree_host()->in_commit();
 }
 
 bool Layer::IsMutationAllowed() const {
-  return !layer_tree_host_ || !layer_tree_host_->in_commit();
+  if (!IsAttached())
+    return true;
+  DCHECK(IsMainThread());
+  return !layer_tree_host()->in_commit();
 }
 
 void Layer::CaptureContent(const gfx::Rect& rect,
@@ -353,7 +357,7 @@
     return;
   inputs_.bounds = size;
 
-  if (!layer_tree_host_)
+  if (!IsAttached())
     return;
 
   // Rounded corner clipping, bounds clipping and mask clipping can result in
@@ -362,7 +366,7 @@
   // marked as capturable (via a valid SubtreeCaptureId), then the property tree
   // needs rebuild so that |EffectNode::subtree_size| is updated with the new
   // size of this layer.
-  if (!layer_tree_host_->IsUsingLayerLists()) {
+  if (!IsUsingLayerLists()) {
     if (subtree_capture_id().is_valid() || masks_to_bounds() || mask_layer() ||
         HasRoundedCorner()) {
       SetSubtreePropertyChanged();
@@ -370,7 +374,7 @@
     }
 
     if (scrollable()) {
-      auto& scroll_tree = layer_tree_host_->property_trees()->scroll_tree;
+      auto& scroll_tree = layer_tree_host()->property_trees()->scroll_tree;
       if (auto* scroll_node = scroll_tree.Node(scroll_tree_index_))
         scroll_node->bounds = inputs_.bounds;
       else
@@ -398,7 +402,7 @@
 }
 
 void Layer::SetChildLayerList(LayerList new_children) {
-  DCHECK(layer_tree_host_->IsUsingLayerLists());
+  DCHECK(IsUsingLayerLists());
   DCHECK(IsMutationAllowed());
 
   // Early out without calling |LayerTreeHost::SetNeedsFullTreeSync| if no
@@ -446,7 +450,7 @@
 
   inputs_.children = std::move(new_children);
 
-  layer_tree_host_->SetNeedsFullTreeSync();
+  layer_tree_host()->SetNeedsFullTreeSync();
 }
 
 bool Layer::HasAncestor(const Layer* ancestor) const {
@@ -475,8 +479,8 @@
   SetSubtreePropertyChanged();
   SetPropertyTreesNeedRebuild();
   SetNeedsCommit();
-  if (layer_tree_host_)
-    layer_tree_host_->SetHasCopyRequest(true);
+  if (IsAttached())
+    layer_tree_host()->SetHasCopyRequest(true);
 }
 
 void Layer::SetSubtreeHasCopyRequest(bool subtree_has_copy_request) {
@@ -484,11 +488,11 @@
 }
 
 bool Layer::SubtreeHasCopyRequest() const {
-  DCHECK(layer_tree_host_);
+  DCHECK(IsAttached());
   // When the copy request is pushed to effect tree, we reset layer tree host's
   // has_copy_request but do not clear subtree_has_copy_request on individual
   // layers.
-  return layer_tree_host_->has_copy_request() && subtree_has_copy_request_;
+  return layer_tree_host()->has_copy_request() && subtree_has_copy_request_;
 }
 
 void Layer::SetBackgroundColor(SkColor background_color) {
@@ -512,7 +516,7 @@
 
 SkColor Layer::SafeOpaqueBackgroundColor(SkColor host_background_color) const {
   if (contents_opaque()) {
-    if (!layer_tree_host_ || !layer_tree_host_->IsUsingLayerLists()) {
+    if (!IsAttached() || !IsUsingLayerLists()) {
       // In layer tree mode, PropertyTreeBuilder should have calculated the safe
       // opaque background color and called SetSafeOpaqueBackgroundColor().
       DCHECK(layer_tree_inputs());
@@ -541,8 +545,8 @@
 
 SkColor Layer::SafeOpaqueBackgroundColor() const {
   SkColor host_background_color =
-      layer_tree_host_ ? layer_tree_host_->background_color()
-                       : layer_tree_inputs()->safe_opaque_background_color;
+      IsAttached() ? layer_tree_host()->pending_commit_state()->background_color
+                   : layer_tree_inputs()->safe_opaque_background_color;
   return SafeOpaqueBackgroundColor(host_background_color);
 }
 
@@ -569,7 +573,7 @@
 
   SetSubtreePropertyChanged();
   if (clip_tree_index() != ClipTree::kInvalidNodeId && !force_rebuild) {
-    PropertyTrees* property_trees = layer_tree_host_->property_trees();
+    PropertyTrees* property_trees = layer_tree_host()->property_trees();
     gfx::RectF effective_clip_rect = EffectiveClipRect();
     if (ClipNode* node = property_trees->clip_tree.Node(clip_tree_index())) {
       node->clip = effective_clip_rect;
@@ -592,7 +596,7 @@
   SetNeedsCommit();
 }
 
-gfx::RectF Layer::EffectiveClipRect() {
+gfx::RectF Layer::EffectiveClipRect() const {
   // If this does not have a clip rect set, then the subtree is clipped by
   // the bounds.
   const gfx::RectF layer_bounds = gfx::RectF(gfx::SizeF(bounds()));
@@ -683,7 +687,7 @@
   SetSubtreePropertyChanged();
   SetNeedsCommit();
   PropertyTrees* property_trees =
-      layer_tree_host_ ? layer_tree_host_->property_trees() : nullptr;
+      IsAttached() ? layer_tree_host()->property_trees() : nullptr;
   EffectNode* node = nullptr;
   if (property_trees && effect_tree_index() != EffectTree::kInvalidNodeId &&
       (node = property_trees->effect_tree.Node(effect_tree_index()))) {
@@ -727,9 +731,9 @@
   inputs.opacity = opacity;
   SetSubtreePropertyChanged();
 
-  if (layer_tree_host_) {
+  if (IsAttached()) {
     if (!force_rebuild) {
-      PropertyTrees* property_trees = layer_tree_host_->property_trees();
+      PropertyTrees* property_trees = layer_tree_host()->property_trees();
       if (EffectNode* node =
               property_trees->effect_tree.Node(effect_tree_index())) {
         node->opacity = opacity;
@@ -843,7 +847,7 @@
 }
 
 void Layer::SetPosition(const gfx::PointF& position) {
-  DCHECK(!layer_tree_host_ || !layer_tree_host_->IsUsingLayerLists());
+  DCHECK(!IsAttached() || !IsUsingLayerLists());
 
   // The mask layer should always be at the same location as the masked layer
   // which is its parent, so its position should be always zero.
@@ -858,14 +862,14 @@
     return;
   inputs.position = position;
 
-  if (!layer_tree_host_)
+  if (!IsAttached())
     return;
 
   SetSubtreePropertyChanged();
 
   if (has_transform_node_) {
     TransformNode* transform_node =
-        layer_tree_host_->property_trees()->transform_tree.Node(
+        layer_tree_host()->property_trees()->transform_tree.Node(
             transform_tree_index_);
     // We should never set root layer's position to non-zero.
     DCHECK(parent());
@@ -873,7 +877,7 @@
         position.OffsetFromOrigin() + parent()->offset_to_transform_parent();
     transform_node->needs_local_transform_update = true;
     transform_node->transform_changed = true;
-    layer_tree_host_->property_trees()->transform_tree.set_needs_update(true);
+    layer_tree_host()->property_trees()->transform_tree.set_needs_update(true);
   } else {
     SetPropertyTreesNeedRebuild();
   }
@@ -903,10 +907,10 @@
     return;
 
   SetSubtreePropertyChanged();
-  if (layer_tree_host_) {
+  if (IsAttached()) {
     if (has_transform_node_) {
       TransformNode* transform_node =
-          layer_tree_host_->property_trees()->transform_tree.Node(
+          layer_tree_host()->property_trees()->transform_tree.Node(
               transform_tree_index_);
       // We need to trigger a rebuild if we could have affected 2d axis
       // alignment. We'll check to see if transform and inputs_.transform are
@@ -917,7 +921,8 @@
       transform_node->local = transform;
       transform_node->needs_local_transform_update = true;
       transform_node->transform_changed = true;
-      layer_tree_host_->property_trees()->transform_tree.set_needs_update(true);
+      layer_tree_host()->property_trees()->transform_tree.set_needs_update(
+          true);
       if (!preserves_2d_axis_alignment)
         SetPropertyTreesNeedRebuild();
     } else {
@@ -936,20 +941,20 @@
     return;
   inputs.transform_origin = transform_origin;
 
-  if (!layer_tree_host_)
+  if (!IsAttached())
     return;
 
   SetSubtreePropertyChanged();
 
   if (has_transform_node_) {
     TransformNode* transform_node =
-        layer_tree_host_->property_trees()->transform_tree.Node(
+        layer_tree_host()->property_trees()->transform_tree.Node(
             transform_tree_index_);
     DCHECK_EQ(transform_tree_index(), transform_node->id);
     transform_node->origin = transform_origin;
     transform_node->needs_local_transform_update = true;
     transform_node->transform_changed = true;
-    layer_tree_host_->property_trees()->transform_tree.set_needs_update(true);
+    layer_tree_host()->property_trees()->transform_tree.set_needs_update(true);
   } else {
     SetPropertyTreesNeedRebuild();
   }
@@ -965,7 +970,7 @@
     return;
   inputs.scroll_offset = scroll_offset;
 
-  if (!layer_tree_host_)
+  if (!IsAttached())
     return;
 
   UpdatePropertyTreeScrollOffset();
@@ -977,7 +982,7 @@
   DCHECK(IsPropertyChangeAllowed());
   // This function only gets called during a BeginMainFrame, so there
   // is no need to call SetNeedsUpdate here.
-  DCHECK(layer_tree_host_ && layer_tree_host_->CommitRequested());
+  DCHECK(IsAttached() && layer_tree_host()->CommitRequested());
 
   auto& inputs = EnsureLayerTreeInputs();
   if (inputs.scroll_offset == scroll_offset)
@@ -995,19 +1000,19 @@
 
 void Layer::UpdatePropertyTreeScrollOffset() {
   DCHECK(scrollable());
-  DCHECK(!layer_tree_host_->IsUsingLayerLists());
+  DCHECK(!IsUsingLayerLists());
 
   if (scroll_tree_index() == ScrollTree::kInvalidNodeId) {
     // Ensure the property trees just have not been built yet but are marked for
     // being built which will set the correct scroll offset values.
-    DCHECK(layer_tree_host_->property_trees()->needs_rebuild);
+    DCHECK(layer_tree_host()->property_trees()->needs_rebuild);
     return;
   }
 
   // If a scroll node exists, it should have an associated transform node.
   DCHECK(transform_tree_index() != TransformTree::kInvalidNodeId);
 
-  auto& property_trees = *layer_tree_host_->property_trees();
+  auto& property_trees = *layer_tree_host()->property_trees();
   property_trees.scroll_tree.SetScrollOffset(element_id(), scroll_offset());
   auto* transform_node =
       property_trees.transform_tree.Node(transform_tree_index());
@@ -1048,10 +1053,10 @@
   inputs.scrollable = true;
   inputs.scroll_container_bounds = bounds;
 
-  if (!layer_tree_host_)
+  if (!IsAttached())
     return;
 
-  auto& scroll_tree = layer_tree_host_->property_trees()->scroll_tree;
+  auto& scroll_tree = layer_tree_host()->property_trees()->scroll_tree;
   auto* scroll_node = scroll_tree.Node(scroll_tree_index_);
   if (was_scrollable && scroll_node)
     scroll_node->container_bounds = inputs.scroll_container_bounds;
@@ -1073,11 +1078,11 @@
     return;
   inputs.user_scrollable_horizontal = horizontal;
   inputs.user_scrollable_vertical = vertical;
-  if (!layer_tree_host_)
+  if (!IsAttached())
     return;
 
   if (scrollable()) {
-    auto& scroll_tree = layer_tree_host_->property_trees()->scroll_tree;
+    auto& scroll_tree = layer_tree_host()->property_trees()->scroll_tree;
     if (auto* scroll_node = scroll_tree.Node(scroll_tree_index_)) {
       scroll_node->user_scrollable_horizontal = horizontal;
       scroll_node->user_scrollable_vertical = vertical;
@@ -1151,11 +1156,11 @@
 }
 
 RenderSurfaceReason Layer::GetRenderSurfaceReason() const {
-  if (!layer_tree_host_)
+  if (!IsAttached())
     return RenderSurfaceReason::kNone;
-  PropertyTrees* property_trees = layer_tree_host_->property_trees();
+  const PropertyTrees* property_trees = layer_tree_host()->property_trees();
   DCHECK(!property_trees->needs_rebuild);
-  EffectNode* effect_node =
+  const EffectNode* effect_node =
       property_trees->effect_tree.Node(this->effect_tree_index());
 
   // Effect node can also be the effect node of an ancestor layer.
@@ -1302,8 +1307,8 @@
 }
 
 void Layer::SetPropertyTreesNeedRebuild() {
-  if (layer_tree_host_)
-    layer_tree_host_->property_trees()->needs_rebuild = true;
+  if (IsAttached())
+    layer_tree_host()->property_trees()->needs_rebuild = true;
 }
 
 LayerDebugInfo& Layer::EnsureDebugInfo() {
@@ -1383,11 +1388,11 @@
   SetNeedsPushProperties();
   inputs_.update_rect.Union(dirty_rect);
 
-  if (DrawsContent() && layer_tree_host_ && !ignore_set_needs_commit_)
-    layer_tree_host_->SetNeedsUpdateLayers();
+  if (DrawsContent() && IsAttached() && !ignore_set_needs_commit_)
+    layer_tree_host()->SetNeedsUpdateLayers();
 }
 
-bool Layer::IsSnappedToPixelGridInTarget() {
+bool Layer::IsSnappedToPixelGridInTarget() const {
   return false;
 }
 
@@ -1396,7 +1401,7 @@
                              const ThreadUnsafeCommitState& unsafe_state) {
   TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("cc.debug"),
                "Layer::PushPropertiesTo");
-  DCHECK(layer_tree_host_);
+  DCHECK(IsAttached());
 
   const PropertyTrees& property_trees = unsafe_state.property_trees;
 
@@ -1512,7 +1517,7 @@
 }
 
 bool Layer::Update() {
-  DCHECK(layer_tree_host_);
+  DCHECK(IsAttached());
   return false;
 }
 
@@ -1530,6 +1535,18 @@
   SetNeedsPushProperties();
 }
 
+bool Layer::IsMainThread() const {
+  return IsAttached() && layer_tree_host_->IsMainThread();
+}
+
+bool Layer::IsImplThread() const {
+  return IsAttached() && layer_tree_host_->IsImplThread();
+}
+
+bool Layer::IsUsingLayerLists() const {
+  return IsAttached() && layer_tree_host_->IsUsingLayerLists();
+}
+
 // On<Property>Animated is called due to an ongoing accelerated animation.
 // Since this animation is also being run on the compositor thread, there
 // is no need to request a commit to push this value over, so the value is
@@ -1608,13 +1625,13 @@
     return;
   TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("cc.debug"), "Layer::SetElementId",
                "element", id.ToString());
-  if (layer_tree_host_ && inputs_.element_id)
-    layer_tree_host_->UnregisterElement(inputs_.element_id);
+  if (IsAttached() && inputs_.element_id)
+    layer_tree_host()->UnregisterElement(inputs_.element_id);
 
   inputs_.element_id = id;
 
-  if (layer_tree_host_ && inputs_.element_id)
-    layer_tree_host_->RegisterElement(inputs_.element_id, this);
+  if (IsAttached() && inputs_.element_id)
+    layer_tree_host()->RegisterElement(inputs_.element_id, this);
 
   SetNeedsCommit();
 }
@@ -1622,7 +1639,7 @@
 gfx::Transform Layer::ScreenSpaceTransform() const {
   DCHECK_NE(transform_tree_index_, TransformTree::kInvalidNodeId);
   return draw_property_utils::ScreenSpaceTransform(
-      this, layer_tree_host_->property_trees()->transform_tree);
+      this, layer_tree_host()->property_trees()->transform_tree);
 }
 
 }  // namespace cc

cc/layers/layer.h

diff --git a/cc/layers/layer.h b/cc/layers/layer.h
index c6ff3c6..520c0f1 100644
--- a/cc/layers/layer.h
+++ b/cc/layers/layer.h
@@ -133,14 +133,25 @@
   // The list of children of this layer.
   const LayerList& children() const { return inputs_.children; }
 
+  // These methods provide information from layer_tree_host_ in a way that is
+  // safe to query from either the main or impl thread.
   bool IsAttached() const { return layer_tree_host_; }
+  bool IsMainThread() const;
+  bool IsImplThread() const;
+  bool IsUsingLayerLists() const;
 
   // Gets the LayerTreeHost that this layer is attached to, or null if not.
   // A layer is attached to a LayerTreeHost if it or an ancestor layer is set as
   // the root layer of a LayerTreeHost (while noting only a layer without a
   // parent may be set as the root layer).
-  LayerTreeHost* layer_tree_host() { return layer_tree_host_; }
-  const LayerTreeHost* layer_tree_host() const { return layer_tree_host_; }
+  LayerTreeHost* layer_tree_host() {
+    DCHECK(!IsAttached() || IsMainThread());
+    return layer_tree_host_;
+  }
+  const LayerTreeHost* layer_tree_host() const {
+    DCHECK(!IsAttached() || IsMainThread());
+    return layer_tree_host_;
+  }
 
   // This requests the layer and its subtree be rendered and given to the
   // callback. If the copy is unable to be produced (the layer is destroyed
@@ -224,7 +235,7 @@
   }
 
   // Returns the bounds which is clipped by the clip rect.
-  gfx::RectF EffectiveClipRect();
+  gfx::RectF EffectiveClipRect() const;
 
   // For layer tree mode only.
   // Set or get a layer that will mask the contents of this layer. The alpha
@@ -667,7 +678,7 @@
   // grid in its rendering target. This ensures that the layer is not fuzzy
   // (unless it is being scaled). Layers may override this to return true, by
   // default layers are not snapped.
-  virtual bool IsSnappedToPixelGridInTarget();
+  virtual bool IsSnappedToPixelGridInTarget() const;
 
   // Internal method that is called when a Layer is attached to a LayerTreeHost.
   // This would happen when

cc/layers/nine_patch_layer.cc

diff --git a/cc/layers/nine_patch_layer.cc b/cc/layers/nine_patch_layer.cc
index 57cad735..338a4de 100644
--- a/cc/layers/nine_patch_layer.cc
+++ b/cc/layers/nine_patch_layer.cc
@@ -74,7 +74,7 @@
   NinePatchLayerImpl* layer_impl = static_cast<NinePatchLayerImpl*>(layer);
 
   if (resource_id()) {
-    DCHECK(layer_tree_host());
+    DCHECK(IsAttached());
     layer_impl->SetLayout(image_aperture_, border_, layer_occlusion_,
                           fill_center_, nearest_neighbor_);
   }

cc/layers/texture_layer.cc

diff --git a/cc/layers/texture_layer.cc b/cc/layers/texture_layer.cc
index b1ab993d..a48cc7e 100644
--- a/cc/layers/texture_layer.cc
+++ b/cc/layers/texture_layer.cc
@@ -18,7 +18,7 @@
 #include "cc/base/simple_enclosed_region.h"
 #include "cc/layers/texture_layer_client.h"
 #include "cc/layers/texture_layer_impl.h"
-#include "cc/trees/layer_tree_host.h"
+#include "cc/trees/layer_tree_impl.h"
 
 namespace cc {
 
@@ -182,7 +182,7 @@
   return updated || !update_rect().IsEmpty();
 }
 
-bool TextureLayer::IsSnappedToPixelGridInTarget() {
+bool TextureLayer::IsSnappedToPixelGridInTarget() const {
   // Often layers are positioned with CSS to "50%", which can often leave them
   // with a fractional (N + 0.5) pixel position. This would leave them looking
   // fuzzy, so we request that TextureLayers are snapped to the pixel grid,
@@ -212,8 +212,10 @@
     if (holder_ref_) {
       TransferableResourceHolder* holder = holder_ref_->holder();
       resource = holder->resource();
-      release_callback = holder->GetCallbackForImplThread(
-          layer_tree_host()->GetTaskRunnerProvider()->MainThreadTaskRunner());
+      release_callback =
+          holder->GetCallbackForImplThread(layer->layer_tree_impl()
+                                               ->task_runner_provider()
+                                               ->MainThreadTaskRunner());
     }
     texture_layer->SetTransferableResource(resource,
                                            std::move(release_callback));

cc/layers/texture_layer.h

diff --git a/cc/layers/texture_layer.h b/cc/layers/texture_layer.h
index 3501e76..7701767 100644
--- a/cc/layers/texture_layer.h
+++ b/cc/layers/texture_layer.h
@@ -154,7 +154,7 @@
 
   void SetLayerTreeHost(LayerTreeHost* layer_tree_host) override;
   bool Update() override;
-  bool IsSnappedToPixelGridInTarget() override;
+  bool IsSnappedToPixelGridInTarget() const override;
   void PushPropertiesTo(LayerImpl* layer,
                         const CommitState& commit_state,
                         const ThreadUnsafeCommitState& unsafe_state) override;

cc/layers/texture_layer_unittest.cc

diff --git a/cc/layers/texture_layer_unittest.cc b/cc/layers/texture_layer_unittest.cc
index 195a22a..6fd740f 100644
--- a/cc/layers/texture_layer_unittest.cc
+++ b/cc/layers/texture_layer_unittest.cc
@@ -592,7 +592,7 @@
     return std::make_unique<TestLayerTreeFrameSink>(
         compositor_context_provider, std::move(worker_context_provider),
         gpu_memory_buffer_manager(), renderer_settings, &debug_settings_,
-        ImplThreadTaskRunner(), synchronous_composite, disable_display_vsync,
+        task_runner_provider(), synchronous_composite, disable_display_vsync,
         refresh_rate);
   }
 
@@ -1394,7 +1394,7 @@
         !layer_tree_host()->GetSettings().single_thread_proxy_scheduler;
     auto sink = std::make_unique<TestLayerTreeFrameSink>(
         nullptr, nullptr, gpu_memory_buffer_manager(), renderer_settings,
-        &debug_settings_, ImplThreadTaskRunner(), synchronous_composite,
+        &debug_settings_, task_runner_provider(), synchronous_composite,
         disable_display_vsync, refresh_rate);
     frame_sink_ = sink.get();
     num_frame_sinks_created_++;

cc/metrics/compositor_frame_reporter.h

diff --git a/cc/metrics/compositor_frame_reporter.h b/cc/metrics/compositor_frame_reporter.h
index 9239b5cb..2bcdf928 100644
--- a/cc/metrics/compositor_frame_reporter.h
+++ b/cc/metrics/compositor_frame_reporter.h
@@ -31,12 +31,14 @@
 }
 
 namespace cc {
+class FrameSequenceTrackerCollection;
 class DroppedFrameCounter;
 class LatencyUkmReporter;
 
 struct GlobalMetricsTrackers {
   DroppedFrameCounter* dropped_frame_counter = nullptr;
   LatencyUkmReporter* latency_ukm_reporter = nullptr;
+  FrameSequenceTrackerCollection* frame_sequence_trackers = nullptr;
 };
 
 // This is used for tracing and reporting the duration of pipeline stages within

cc/metrics/compositor_frame_reporting_controller.cc

diff --git a/cc/metrics/compositor_frame_reporting_controller.cc b/cc/metrics/compositor_frame_reporting_controller.cc
index d069b53..9285b67 100644
--- a/cc/metrics/compositor_frame_reporting_controller.cc
+++ b/cc/metrics/compositor_frame_reporting_controller.cc
@@ -10,6 +10,7 @@
 #include "base/trace_event/trace_id_helper.h"
 #include "cc/metrics/compositor_frame_reporter.h"
 #include "cc/metrics/dropped_frame_counter.h"
+#include "cc/metrics/frame_sequence_tracker_collection.h"
 #include "cc/metrics/latency_ukm_reporter.h"
 #include "components/viz/common/frame_timing_details.h"
 #include "components/viz/common/quads/compositor_frame_metadata.h"
@@ -737,4 +738,22 @@
   }
 }
 
+void CompositorFrameReportingController::AddSortedFrame(
+    const viz::BeginFrameArgs& args,
+    const FrameInfo& frame_info) {
+  if (global_trackers_.frame_sequence_trackers) {
+    global_trackers_.frame_sequence_trackers->AddSortedFrame(args, frame_info);
+  }
+}
+
+void CompositorFrameReportingController::SetDroppedFrameCounter(
+    DroppedFrameCounter* counter) {
+  global_trackers_.dropped_frame_counter = counter;
+  if (counter) {
+    counter->SetSortedFrameCallback(
+        base::BindRepeating(&CompositorFrameReportingController::AddSortedFrame,
+                            base::Unretained(this)));
+  }
+}
+
 }  // namespace cc

cc/metrics/compositor_frame_reporting_controller.h

diff --git a/cc/metrics/compositor_frame_reporting_controller.h b/cc/metrics/compositor_frame_reporting_controller.h
index 998a787..b3dc01c 100644
--- a/cc/metrics/compositor_frame_reporting_controller.h
+++ b/cc/metrics/compositor_frame_reporting_controller.h
@@ -26,6 +26,7 @@
 class DroppedFrameCounter;
 class UkmManager;
 struct BeginMainFrameMetrics;
+struct FrameInfo;
 
 // This is used for managing simultaneous CompositorFrameReporter instances
 // in the case that the compositor has high latency. Calling one of the
@@ -99,8 +100,11 @@
 
   std::unique_ptr<CompositorFrameReporter>* reporters() { return reporters_; }
 
-  void SetDroppedFrameCounter(DroppedFrameCounter* counter) {
-    global_trackers_.dropped_frame_counter = counter;
+  void SetDroppedFrameCounter(DroppedFrameCounter* counter);
+
+  void SetFrameSequenceTrackerCollection(
+      FrameSequenceTrackerCollection* frame_sequence_trackers) {
+    global_trackers_.frame_sequence_trackers = frame_sequence_trackers;
   }
 
   void BeginMainFrameStarted(base::TimeTicks begin_main_frame_start_time) {
@@ -158,6 +162,9 @@
   void ReportMultipleSwaps(base::TimeTicks begin_frame_time,
                            base::TimeDelta interval);
 
+  void AddSortedFrame(const viz::BeginFrameArgs& args,
+                      const FrameInfo& frame_info);
+
   const bool should_report_metrics_;
   const int layer_tree_host_id_;
 

cc/metrics/dropped_frame_counter.cc

diff --git a/cc/metrics/dropped_frame_counter.cc b/cc/metrics/dropped_frame_counter.cc
index 0d99179a..db8d087 100644
--- a/cc/metrics/dropped_frame_counter.cc
+++ b/cc/metrics/dropped_frame_counter.cc
@@ -469,6 +469,9 @@
   if (args.interval >= sliding_window_interval_)
     return;
 
+  if (sorted_frame_callback_)
+    sorted_frame_callback_->Run(args, frame_info);
+
   sliding_window_.push({args, frame_info});
   UpdateDroppedFrameCountInWindow(frame_info, 1);
 
@@ -592,7 +595,7 @@
     dropped_frame_count_in_window_[SmoothnessStrategy::kMainFocusedStrategy] +=
         count;
   }
-  if (frame_info.WasScrollUpdateDropped()) {
+  if (frame_info.IsScrollPrioritizeFrameDropped()) {
     DCHECK_GE(dropped_frame_count_in_window_
                       [SmoothnessStrategy::kScrollFocusedStrategy] +
                   count,
@@ -629,4 +632,8 @@
   time_fcp_received_ = base::TimeTicks::Now();
 }
 
+void DroppedFrameCounter::SetSortedFrameCallback(SortedFrameCallback callback) {
+  sorted_frame_callback_ = callback;
+}
+
 }  // namespace cc

cc/metrics/dropped_frame_counter.h

diff --git a/cc/metrics/dropped_frame_counter.h b/cc/metrics/dropped_frame_counter.h
index e90c9b34..38248dc 100644
--- a/cc/metrics/dropped_frame_counter.h
+++ b/cc/metrics/dropped_frame_counter.h
@@ -11,6 +11,7 @@
 #include <utility>
 #include <vector>
 
+#include "base/callback_forward.h"
 #include "base/containers/ring_buffer.h"
 #include "base/memory/raw_ptr.h"
 #include "cc/cc_export.h"
@@ -75,6 +76,11 @@
   double GetMostRecentAverageSmoothness() const;
   double GetMostRecent95PercentileSmoothness() const;
 
+  using SortedFrameCallback =
+      base::RepeatingCallback<void(const viz::BeginFrameArgs& args,
+                                   const FrameInfo&)>;
+  void SetSortedFrameCallback(SortedFrameCallback callback);
+
   typedef base::RingBuffer<FrameState, 180> RingBufferType;
   RingBufferType::Iterator begin() const { return ring_buffer_.Begin(); }
   RingBufferType::Iterator end() const { return ring_buffer_.End(); }
@@ -207,6 +213,8 @@
   absl::optional<ScrollStartInfo> scroll_start_;
   std::map<viz::BeginFrameId, ScrollStartInfo> scroll_start_per_frame_;
 
+  absl::optional<SortedFrameCallback> sorted_frame_callback_;
+
   bool report_for_ui_ = false;
 };
 

cc/metrics/frame_info.cc

diff --git a/cc/metrics/frame_info.cc b/cc/metrics/frame_info.cc
index 7094c9e..6d03d2f 100644
--- a/cc/metrics/frame_info.cc
+++ b/cc/metrics/frame_info.cc
@@ -75,7 +75,16 @@
     DCHECK_EQ(MainThreadResponse::kMissing, other.main_thread_response);
     DCHECK(ValidateFinalStateIsForMainThread(final_state));
 
-    main_update_was_dropped = final_state == FrameFinalState::kDropped;
+    // If the compositor-only update did not include any changes from the
+    // main-thread, then it did drop the main-thread update. Therefore, overall
+    // the main-thread update was dropped, even if the 'main thread update' is
+    // presented in a subsequent frame.
+    bool compositor_only_change_included_new_main =
+        other.final_state == FrameFinalState::kPresentedAll ||
+        other.final_state == FrameFinalState::kPresentedPartialNewMain;
+    main_update_was_dropped = final_state == FrameFinalState::kDropped ||
+                              !compositor_only_change_included_new_main;
+
     compositor_update_was_dropped =
         other.final_state == FrameFinalState::kDropped;
   } else {
@@ -163,14 +172,17 @@
   return false;
 }
 
-bool FrameInfo::WasScrollUpdateDropped() const {
+bool FrameInfo::IsScrollPrioritizeFrameDropped() const {
+  // If any scroll is active the dropped frame for only the scrolling thread is
+  // reported. If no scroll is active then reports if dropped frames is
+  // affecting smoothness.
   switch (scroll_thread) {
     case SmoothEffectDrivingThread::kCompositor:
       return WasCompositorUpdateDropped();
     case SmoothEffectDrivingThread::kMain:
       return WasMainUpdateDropped();
     case SmoothEffectDrivingThread::kUnknown:
-      return false;
+      return IsDroppedAffectingSmoothness();
   }
 }
 

cc/metrics/frame_info.h

diff --git a/cc/metrics/frame_info.h b/cc/metrics/frame_info.h
index a0b4fc64..aa3a3a2 100644
--- a/cc/metrics/frame_info.h
+++ b/cc/metrics/frame_info.h
@@ -68,7 +68,7 @@
 
   bool WasCompositorUpdateDropped() const;
   bool WasMainUpdateDropped() const;
-  bool WasScrollUpdateDropped() const;
+  bool IsScrollPrioritizeFrameDropped() const;
 
  private:
   bool was_merged = false;

cc/metrics/frame_info_unittest.cc

diff --git a/cc/metrics/frame_info_unittest.cc b/cc/metrics/frame_info_unittest.cc
new file mode 100644
index 0000000..2ac2cb2
--- /dev/null
+++ b/cc/metrics/frame_info_unittest.cc
@@ -0,0 +1,53 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "cc/metrics/frame_info.h"
+
+#include "testing/gtest/include/gtest/gtest.h"
+
+namespace cc {
+namespace {
+
+using MainThreadResponse = FrameInfo::MainThreadResponse;
+using FrameFinalState = FrameInfo::FrameFinalState;
+
+TEST(FrameInfoTest, WasMainUpdateDroppedForkedReporters) {
+  FrameInfo main, compositor;
+
+  main.main_thread_response = MainThreadResponse::kIncluded;
+  compositor.main_thread_response = MainThreadResponse::kMissing;
+
+  // For a 'forked' frame: the compositor-update is dropped, and the main-thread
+  // update was presented. For this frame, both the compositor-thread and the
+  // main-thread update are considered dropped (because the compositor-thread
+  // did not update any new main-thread).
+  main.final_state = FrameFinalState::kPresentedAll;
+  compositor.final_state = FrameFinalState::kDropped;
+
+  auto test = main;
+  test.MergeWith(compositor);
+  EXPECT_TRUE(test.WasMainUpdateDropped());
+  EXPECT_TRUE(test.WasCompositorUpdateDropped());
+
+  // Even if the compositor-thread update is presented, the overall main-thread
+  // update is dropped if the compositor-update is not accompanied by new
+  // main-thread update (from earlier frames).
+  compositor.final_state = FrameFinalState::kPresentedPartialOldMain;
+  test = main;
+  test.MergeWith(compositor);
+  EXPECT_TRUE(test.WasMainUpdateDropped());
+  EXPECT_FALSE(test.WasCompositorUpdateDropped());
+
+  // If the compositor-thread is accompanied by new main-thread update (even if
+  // from earlier frames), then the main-thread is update is considered not
+  // dropped.
+  compositor.final_state = FrameFinalState::kPresentedPartialNewMain;
+  test = main;
+  test.MergeWith(compositor);
+  EXPECT_FALSE(test.WasMainUpdateDropped());
+  EXPECT_FALSE(test.WasCompositorUpdateDropped());
+}
+
+}  // namespace
+}  // namespace cc

cc/metrics/frame_sequence_metrics.cc

diff --git a/cc/metrics/frame_sequence_metrics.cc b/cc/metrics/frame_sequence_metrics.cc
index 2ab455c..e4b9c40 100644
--- a/cc/metrics/frame_sequence_metrics.cc
+++ b/cc/metrics/frame_sequence_metrics.cc
@@ -16,6 +16,7 @@
 #include "cc/metrics/frame_sequence_tracker.h"
 #include "cc/metrics/jank_metrics.h"
 #include "cc/metrics/throughput_ukm_reporter.h"
+#include "components/viz/common/frame_sinks/begin_frame_args.h"
 
 namespace cc {
 
@@ -174,6 +175,9 @@
   main_throughput_.Merge(metrics->main_throughput_);
   frames_checkerboarded_ += metrics->frames_checkerboarded_;
 
+  v2_.frames_expected += metrics->v2_.frames_expected;
+  v2_.frames_dropped += metrics->v2_.frames_dropped;
+
   if (jank_reporter_)
     jank_reporter_->Merge(std::move(metrics->jank_reporter_));
 
@@ -234,6 +238,31 @@
   const bool compositor_report = ThroughputData::CanReportHistogram(
       this, SmoothEffectDrivingThread::kCompositor, impl_throughput_);
 
+  if (v2_.frames_expected >= kMinFramesForThroughputMetric) {
+    const auto thread_type = GetEffectiveThread();
+    const bool is_animation = ShouldReportForAnimation(type(), thread_type);
+    const bool is_interaction =
+        ShouldReportForInteraction(type(), thread_type, thread_type);
+    int percent = v2_.frames_expected == 0
+                      ? 0
+                      : std::ceil(100. * v2_.frames_dropped /
+                                  static_cast<double>(v2_.frames_expected));
+
+    if (is_animation) {
+      UMA_HISTOGRAM_PERCENTAGE(
+          "Graphics.Smoothness.PercentDroppedFrames2.AllAnimations", percent);
+    }
+    if (is_interaction) {
+      UMA_HISTOGRAM_PERCENTAGE(
+          "Graphics.Smoothness.PercentDroppedFrames2.AllInteractions", percent);
+    }
+    if (is_animation || is_interaction) {
+      UMA_HISTOGRAM_PERCENTAGE(
+          "Graphics.Smoothness.PercentDroppedFrames2.AllSequences", percent);
+    }
+    v2_ = {};
+  }
+
   absl::optional<int> impl_throughput_percent_dropped;
   absl::optional<int> impl_throughput_percent_missed;
   absl::optional<int> main_throughput_percent_dropped;
@@ -615,4 +644,25 @@
   this->last_timestamp = new_timestamp;
 }
 
+void FrameSequenceMetrics::AddSortedFrame(const viz::BeginFrameArgs& args,
+                                          const FrameInfo& frame_info) {
+  switch (GetEffectiveThread()) {
+    case SmoothEffectDrivingThread::kCompositor:
+      if (frame_info.WasCompositorUpdateDropped()) {
+        ++v2_.frames_dropped;
+      }
+      ++v2_.frames_expected;
+      break;
+    case SmoothEffectDrivingThread::kMain:
+      if (frame_info.WasMainUpdateDropped()) {
+        ++v2_.frames_dropped;
+      }
+      ++v2_.frames_expected;
+      break;
+    case SmoothEffectDrivingThread::kUnknown:
+      NOTREACHED();
+      break;
+  }
+}
+
 }  // namespace cc

cc/metrics/frame_sequence_metrics.h

diff --git a/cc/metrics/frame_sequence_metrics.h b/cc/metrics/frame_sequence_metrics.h
index a64a8b6e..0b979d5 100644
--- a/cc/metrics/frame_sequence_metrics.h
+++ b/cc/metrics/frame_sequence_metrics.h
@@ -14,9 +14,14 @@
 #include "cc/cc_export.h"
 #include "cc/metrics/frame_info.h"
 
+namespace viz {
+struct BeginFrameArgs;
+}  // namespace viz
+
 namespace cc {
 class ThroughputUkmReporter;
 class JankMetrics;
+struct FrameInfo;
 
 enum class FrameSequenceTrackerType {
   // Used as an enum for metrics. DO NOT reorder or delete values. Rather,
@@ -164,6 +169,9 @@
   // Report related metrics: throughput, checkboarding...
   void ReportMetrics();
 
+  void AddSortedFrame(const viz::BeginFrameArgs& args,
+                      const FrameInfo& frame_info);
+
   ThroughputData& impl_throughput() { return impl_throughput_; }
   ThroughputData& main_throughput() { return main_throughput_; }
   void add_checkerboarded_frames(int64_t frames) {
@@ -217,6 +225,12 @@
   // Pointer to the reporter owned by the FrameSequenceTrackerCollection.
   const raw_ptr<ThroughputUkmReporter> throughput_ukm_reporter_;
 
+  // Track state for measuring the PercentDroppedFrames v2 metrics.
+  struct {
+    uint32_t frames_expected = 0;
+    uint32_t frames_dropped = 0;
+  } v2_;
+
   ThroughputData impl_throughput_;
   ThroughputData main_throughput_;
 

cc/metrics/frame_sequence_tracker.cc

diff --git a/cc/metrics/frame_sequence_tracker.cc b/cc/metrics/frame_sequence_tracker.cc
index 4ea0d0a..ca00bb0 100644
--- a/cc/metrics/frame_sequence_tracker.cc
+++ b/cc/metrics/frame_sequence_tracker.cc
@@ -718,6 +718,12 @@
     metrics_->ReportLeftoverData();
 }
 
+void FrameSequenceTracker::AddSortedFrame(const viz::BeginFrameArgs& args,
+                                          const FrameInfo& frame_info) {
+  if (metrics_)
+    metrics_->AddSortedFrame(args, frame_info);
+}
+
 FrameSequenceTracker::CheckerboardingData::CheckerboardingData() = default;
 FrameSequenceTracker::CheckerboardingData::~CheckerboardingData() = default;
 

cc/metrics/frame_sequence_tracker.h

diff --git a/cc/metrics/frame_sequence_tracker.h b/cc/metrics/frame_sequence_tracker.h
index c2f28dd..e395c17 100644
--- a/cc/metrics/frame_sequence_tracker.h
+++ b/cc/metrics/frame_sequence_tracker.h
@@ -108,6 +108,9 @@
   // |metrics_| to report.
   void CleanUp();
 
+  void AddSortedFrame(const viz::BeginFrameArgs& args,
+                      const FrameInfo& frame_info);
+
  private:
   friend class FrameSequenceTrackerCollection;
   friend class FrameSequenceTrackerTest;

cc/metrics/frame_sequence_tracker_collection.cc

diff --git a/cc/metrics/frame_sequence_tracker_collection.cc b/cc/metrics/frame_sequence_tracker_collection.cc
index 8549ccd..b675de1 100644
--- a/cc/metrics/frame_sequence_tracker_collection.cc
+++ b/cc/metrics/frame_sequence_tracker_collection.cc
@@ -407,4 +407,13 @@
   custom_tracker_results_added_callback_.Run(results);
 }
 
+void FrameSequenceTrackerCollection::AddSortedFrame(
+    const viz::BeginFrameArgs& args,
+    const FrameInfo& frame_info) {
+  for (auto& tracker : frame_trackers_)
+    tracker.second->AddSortedFrame(args, frame_info);
+  for (auto& tracker : custom_frame_trackers_)
+    tracker.second->AddSortedFrame(args, frame_info);
+}
+
 }  // namespace cc

cc/metrics/frame_sequence_tracker_collection.h

diff --git a/cc/metrics/frame_sequence_tracker_collection.h b/cc/metrics/frame_sequence_tracker_collection.h
index b74f8ef..f8b023e 100644
--- a/cc/metrics/frame_sequence_tracker_collection.h
+++ b/cc/metrics/frame_sequence_tracker_collection.h
@@ -120,6 +120,9 @@
     custom_tracker_results_added_callback_ = std::move(callback);
   }
 
+  void AddSortedFrame(const viz::BeginFrameArgs& args,
+                      const FrameInfo& frame_info);
+
  private:
   friend class FrameSequenceTrackerTest;
 

cc/test/animation_timelines_test_common.cc

diff --git a/cc/test/animation_timelines_test_common.cc b/cc/test/animation_timelines_test_common.cc
index 0b12e25..146fd0a7 100644
--- a/cc/test/animation_timelines_test_common.cc
+++ b/cc/test/animation_timelines_test_common.cc
@@ -353,6 +353,10 @@
   EXPECT_EQ(transform_y, layer->transform_y());
 }
 
+bool TestHostClient::RunsOnCurrentThread() const {
+  return true;
+}
+
 TestLayer* TestHostClient::FindTestLayer(ElementId element_id,
                                          ElementListType list_type) const {
   const ElementIdToTestLayer& layers_in_tree =

cc/test/animation_timelines_test_common.h

diff --git a/cc/test/animation_timelines_test_common.h b/cc/test/animation_timelines_test_common.h
index 801ff36d..aac24d6 100644
--- a/cc/test/animation_timelines_test_common.h
+++ b/cc/test/animation_timelines_test_common.h
@@ -162,6 +162,8 @@
       PaintWorkletInput::PropertyKey property_key,
       PaintWorkletInput::PropertyValue property_value) override {}
 
+  bool RunsOnCurrentThread() const override;
+
   bool mutators_need_commit() const { return mutators_need_commit_; }
   void set_mutators_need_commit(bool need) { mutators_need_commit_ = need; }
 

cc/test/fake_layer_tree_host_impl_client.h

diff --git a/cc/test/fake_layer_tree_host_impl_client.h b/cc/test/fake_layer_tree_host_impl_client.h
index c5559b05..641339a7 100644
--- a/cc/test/fake_layer_tree_host_impl_client.h
+++ b/cc/test/fake_layer_tree_host_impl_client.h
@@ -40,7 +40,6 @@
   void OnDrawForLayerTreeFrameSink(bool resourceless_software_draw,
                                    bool skip_draw) override {}
   void NeedsImplSideInvalidation(bool needs_first_draw_on_activation) override;
-  void RequestBeginMainFrameNotExpected(bool new_state) override {}
   void NotifyImageDecodeRequestFinished() override {}
   void DidPresentCompositorFrameOnImplThread(
       uint32_t frame_token,

cc/test/layer_tree_pixel_test.cc

diff --git a/cc/test/layer_tree_pixel_test.cc b/cc/test/layer_tree_pixel_test.cc
index 5a62600..54b961f 100644
--- a/cc/test/layer_tree_pixel_test.cc
+++ b/cc/test/layer_tree_pixel_test.cc
@@ -117,7 +117,7 @@
   auto delegating_output_surface = std::make_unique<TestLayerTreeFrameSink>(
       compositor_context_provider, worker_context_provider,
       gpu_memory_buffer_manager(), test_settings, &debug_settings_,
-      ImplThreadTaskRunner(), synchronous_composite, disable_display_vsync,
+      task_runner_provider(), synchronous_composite, disable_display_vsync,
       refresh_rate);
   delegating_output_surface->SetEnlargePassTextureAmount(
       enlarge_texture_amount_);

cc/test/layer_tree_test.cc

diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc
index 59543a2..1cd7fcb 100644
--- a/cc/test/layer_tree_test.cc
+++ b/cc/test/layer_tree_test.cc
@@ -69,7 +69,7 @@
       gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
       const viz::RendererSettings& renderer_settings,
       const viz::DebugRendererSettings* const debug_settings,
-      scoped_refptr<base::SingleThreadTaskRunner> task_runner,
+      TaskRunnerProvider* task_runner_provider,
       double refresh_rate,
       viz::BeginFrameSource* begin_frame_source,
       bool use_software_renderer)
@@ -78,13 +78,12 @@
                                gpu_memory_buffer_manager,
                                renderer_settings,
                                debug_settings,
-                               task_runner,
+                               task_runner_provider,
                                false,
                                false,
                                refresh_rate,
                                begin_frame_source),
-        use_software_renderer_(use_software_renderer),
-        task_runner_(std::move(task_runner)) {}
+        use_software_renderer_(use_software_renderer) {}
   ~SynchronousLayerTreeFrameSink() override = default;
 
   void set_viewport(const gfx::Rect& viewport) { viewport_ = viewport; }
@@ -125,7 +124,7 @@
   void InvalidateIfPossible() {
     if (!frame_request_pending_ || frame_ack_pending_)
       return;
-    task_runner_->PostTask(
+    compositor_task_runner_->PostTask(
         FROM_HERE,
         base::BindOnce(&SynchronousLayerTreeFrameSink::DispatchInvalidation,
                        weak_factory_.GetWeakPtr()));
@@ -141,7 +140,6 @@
   raw_ptr<LayerTreeFrameSinkClient> client_ = nullptr;
   gfx::Rect viewport_;
   const bool use_software_renderer_;
-  scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
   base::WeakPtrFactory<SynchronousLayerTreeFrameSink> weak_factory_{this};
 };
 
@@ -600,52 +598,59 @@
 class LayerTreeTestLayerTreeFrameSinkClient
     : public TestLayerTreeFrameSinkClient {
  public:
-  explicit LayerTreeTestLayerTreeFrameSinkClient(TestHooks* hooks)
-      : hooks_(hooks) {}
+  explicit LayerTreeTestLayerTreeFrameSinkClient(
+      TestHooks* hooks,
+      TaskRunnerProvider* task_runner_provider)
+      : hooks_(hooks), task_runner_provider_(task_runner_provider) {}
 
   // TestLayerTreeFrameSinkClient implementation.
   std::unique_ptr<viz::DisplayCompositorMemoryAndTaskController>
   CreateDisplayController() override {
+    DCHECK(task_runner_provider_->IsImplThread());
     return hooks_->CreateDisplayControllerOnThread();
   }
   std::unique_ptr<viz::SkiaOutputSurface> CreateDisplaySkiaOutputSurface(
       viz::DisplayCompositorMemoryAndTaskController* display_controller)
       override {
+    DCHECK(task_runner_provider_->IsImplThread());
     return hooks_->CreateDisplaySkiaOutputSurfaceOnThread(display_controller);
   }
 
   std::unique_ptr<viz::OutputSurface> CreateDisplayOutputSurface(
       scoped_refptr<viz::ContextProvider> compositor_context_provider)
       override {
+    DCHECK(task_runner_provider_->IsImplThread());
     return hooks_->CreateDisplayOutputSurfaceOnThread(
         std::move(compositor_context_provider));
   }
   void DisplayReceivedLocalSurfaceId(
       const viz::LocalSurfaceId& local_surface_id) override {
+    DCHECK(task_runner_provider_->IsImplThread());
     hooks_->DisplayReceivedLocalSurfaceIdOnThread(local_surface_id);
   }
   void DisplayReceivedCompositorFrame(
       const viz::CompositorFrame& frame) override {
+    DCHECK(task_runner_provider_->IsImplThread());
     hooks_->DisplayReceivedCompositorFrameOnThread(frame);
   }
   void DisplayWillDrawAndSwap(
       bool will_draw_and_swap,
       viz::AggregatedRenderPassList* render_passes) override {
+    DCHECK(task_runner_provider_->IsImplThread());
     hooks_->DisplayWillDrawAndSwapOnThread(will_draw_and_swap, *render_passes);
   }
   void DisplayDidDrawAndSwap() override {
+    DCHECK(task_runner_provider_->IsImplThread());
     hooks_->DisplayDidDrawAndSwapOnThread();
   }
 
  private:
   raw_ptr<TestHooks> hooks_;
+  raw_ptr<TaskRunnerProvider> task_runner_provider_;
 };
 
 LayerTreeTest::LayerTreeTest(viz::RendererType renderer_type)
-    : renderer_type_(renderer_type),
-      initial_root_bounds_(1, 1),
-      layer_tree_frame_sink_client_(
-          new LayerTreeTestLayerTreeFrameSinkClient(this)) {
+    : renderer_type_(renderer_type), initial_root_bounds_(1, 1) {
   main_thread_weak_ptr_ = weak_factory_.GetWeakPtr();
 
   // Tests should timeout quickly unless --cc-layer-tree-test-no-timeout was
@@ -1163,6 +1168,11 @@
   auto layer_tree_frame_sink = CreateLayerTreeFrameSink(
       renderer_settings, refresh_rate, std::move(shared_context_provider),
       std::move(worker_context_provider));
+  if (!layer_tree_frame_sink_client_) {
+    layer_tree_frame_sink_client_ =
+        std::make_unique<LayerTreeTestLayerTreeFrameSinkClient>(
+            this, task_runner_provider());
+  }
   layer_tree_frame_sink->SetClient(layer_tree_frame_sink_client_.get());
   layer_tree_host_->SetLayerTreeFrameSink(std::move(layer_tree_frame_sink));
 }
@@ -1188,14 +1198,14 @@
     return std::make_unique<SynchronousLayerTreeFrameSink>(
         compositor_context_provider, std::move(worker_context_provider),
         gpu_memory_buffer_manager(), renderer_settings, &debug_settings_,
-        impl_task_runner_, refresh_rate, begin_frame_source_,
+        task_runner_provider(), refresh_rate, begin_frame_source_,
         use_software_renderer());
   }
 
   return std::make_unique<TestLayerTreeFrameSink>(
       compositor_context_provider, std::move(worker_context_provider),
       gpu_memory_buffer_manager(), renderer_settings, &debug_settings_,
-      impl_task_runner_, synchronous_composite, disable_display_vsync,
+      task_runner_provider(), synchronous_composite, disable_display_vsync,
       refresh_rate, begin_frame_source_);
 }
 
@@ -1241,13 +1251,11 @@
 }
 
 LayerTreeHost* LayerTreeTest::layer_tree_host() const {
-  DCHECK(task_runner_provider()->IsMainThread() ||
-         task_runner_provider()->IsMainThreadBlocked());
   return layer_tree_host_.get();
 }
 
 Proxy* LayerTreeTest::proxy() {
-  return layer_tree_host() ? layer_tree_host()->proxy() : nullptr;
+  return layer_tree_host() ? layer_tree_host()->proxy_.get() : nullptr;
 }
 
 }  // namespace cc

cc/test/property_tree_test_utils.cc

diff --git a/cc/test/property_tree_test_utils.cc b/cc/test/property_tree_test_utils.cc
index 7febbdd..b40f7eb 100644
--- a/cc/test/property_tree_test_utils.cc
+++ b/cc/test/property_tree_test_utils.cc
@@ -520,10 +520,13 @@
       layer->element_id());
 }
 
-gfx::PointF CurrentScrollOffset(const Layer* layer) {
-  auto result = GetPropertyTrees(layer)->scroll_tree.current_scroll_offset(
-      layer->element_id());
-  if (!layer->layer_tree_host()->IsUsingLayerLists())
+gfx::PointF CurrentScrollOffset(const Layer* layer,
+                                const PropertyTrees* property_trees) {
+  if (!property_trees && layer->IsAttached())
+    property_trees = layer->layer_tree_host()->property_trees();
+  auto result =
+      property_trees->scroll_tree.current_scroll_offset(layer->element_id());
+  if (!layer->IsUsingLayerLists())
     DCHECK_EQ(layer->scroll_offset(), result);
   return result;
 }

cc/test/property_tree_test_utils.h

diff --git a/cc/test/property_tree_test_utils.h b/cc/test/property_tree_test_utils.h
index 8951773..f7a9c72 100644
--- a/cc/test/property_tree_test_utils.h
+++ b/cc/test/property_tree_test_utils.h
@@ -227,7 +227,9 @@
 
 gfx::PointF ScrollOffsetBase(const LayerImpl* layer);
 gfx::Vector2dF ScrollDelta(const LayerImpl* layer);
-gfx::PointF CurrentScrollOffset(const Layer* layer);
+gfx::PointF CurrentScrollOffset(const Layer* layer,
+                                const PropertyTrees* property_trees = nullptr);
+
 gfx::PointF CurrentScrollOffset(const LayerImpl* layer);
 gfx::PointF MaxScrollOffset(const LayerImpl* layer);
 

cc/test/test_layer_tree_frame_sink.cc

diff --git a/cc/test/test_layer_tree_frame_sink.cc b/cc/test/test_layer_tree_frame_sink.cc
index a5c97ce..888f13c 100644
--- a/cc/test/test_layer_tree_frame_sink.cc
+++ b/cc/test/test_layer_tree_frame_sink.cc
@@ -13,6 +13,8 @@
 #include "base/bind.h"
 #include "base/task/single_thread_task_runner.h"
 #include "cc/trees/layer_tree_frame_sink_client.h"
+#include "cc/trees/single_thread_proxy.h"
+#include "cc/trees/task_runner_provider.h"
 #include "components/viz/common/frame_sinks/begin_frame_args.h"
 #include "components/viz/common/resources/bitmap_allocation.h"
 #include "components/viz/service/display/direct_renderer.h"
@@ -32,14 +34,16 @@
     gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
     const viz::RendererSettings& renderer_settings,
     const viz::DebugRendererSettings* const debug_settings,
-    scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner,
+    TaskRunnerProvider* task_runner_provider,
     bool synchronous_composite,
     bool disable_display_vsync,
     double refresh_rate,
     viz::BeginFrameSource* begin_frame_source)
     : LayerTreeFrameSink(std::move(compositor_context_provider),
                          std::move(worker_context_provider),
-                         std::move(compositor_task_runner),
+                         task_runner_provider->HasImplThread()
+                             ? task_runner_provider->ImplThreadTaskRunner()
+                             : task_runner_provider->MainThreadTaskRunner(),
                          gpu_memory_buffer_manager),
       synchronous_composite_(synchronous_composite),
       disable_display_vsync_(disable_display_vsync),
@@ -50,7 +54,8 @@
       parent_local_surface_id_allocator_(
           new viz::ParentLocalSurfaceIdAllocator),
       client_provided_begin_frame_source_(begin_frame_source),
-      external_begin_frame_source_(this) {
+      external_begin_frame_source_(this),
+      task_runner_provider_(task_runner_provider) {
   parent_local_surface_id_allocator_->GenerateId();
 }
 
@@ -64,6 +69,7 @@
 }
 
 bool TestLayerTreeFrameSink::BindToClient(LayerTreeFrameSinkClient* client) {
+  DebugScopedSetImplThread impl(task_runner_provider_);
   if (!LayerTreeFrameSink::BindToClient(client))
     return false;
 
@@ -143,6 +149,7 @@
   // The shared_bitmap_manager_ has ownership of shared memory for each
   // SharedBitmapId that has been reported from the client. Since the client is
   // gone that memory can be freed. If we don't then it would leak.
+  DebugScopedSetImplThread impl(task_runner_provider_);
   for (const auto& id : owned_bitmaps_)
     shared_bitmap_manager_->ChildDeletedSharedBitmap(id);
   owned_bitmaps_.clear();
@@ -165,12 +172,14 @@
 
 void TestLayerTreeFrameSink::SetLocalSurfaceId(
     const viz::LocalSurfaceId& local_surface_id) {
+  DebugScopedSetImplThread impl(task_runner_provider_);
   test_client_->DisplayReceivedLocalSurfaceId(local_surface_id);
 }
 
 void TestLayerTreeFrameSink::SubmitCompositorFrame(viz::CompositorFrame frame,
                                                    bool hit_test_data_changed,
                                                    bool show_hit_test_borders) {
+  DebugScopedSetImplThread impl(task_runner_provider_);
   DCHECK(frame.metadata.begin_frame_ack.has_damage);
   DCHECK(frame.metadata.begin_frame_ack.frame_id.IsSequenceValid());
   test_client_->DisplayReceivedCompositorFrame(frame);
@@ -206,6 +215,7 @@
 
 void TestLayerTreeFrameSink::DidNotProduceFrame(const viz::BeginFrameAck& ack,
                                                 FrameSkippedReason reason) {
+  DebugScopedSetImplThread impl(task_runner_provider_);
   DCHECK(!ack.has_damage);
   DCHECK(ack.frame_id.IsSequenceValid());
   support_->DidNotProduceFrame(ack);
@@ -214,6 +224,7 @@
 void TestLayerTreeFrameSink::DidAllocateSharedBitmap(
     base::ReadOnlySharedMemoryRegion region,
     const viz::SharedBitmapId& id) {
+  DebugScopedSetImplThread impl(task_runner_provider_);
   bool ok =
       shared_bitmap_manager_->ChildAllocatedSharedBitmap(region.Map(), id);
   DCHECK(ok);
@@ -228,6 +239,7 @@
 
 void TestLayerTreeFrameSink::DidReceiveCompositorFrameAck(
     std::vector<viz::ReturnedResource> resources) {
+  DebugScopedSetImplThread impl(task_runner_provider_);
   ReclaimResources(std::move(resources));
   // In synchronous mode, we manually send acks and this method should not be
   // used.
@@ -239,6 +251,7 @@
 void TestLayerTreeFrameSink::OnBeginFrame(
     const viz::BeginFrameArgs& args,
     const viz::FrameTimingDetailsMap& timing_details) {
+  DebugScopedSetImplThread impl(task_runner_provider_);
   for (const auto& pair : timing_details)
     client_->DidPresentCompositorFrame(pair.first, pair.second);
   external_begin_frame_source_.OnBeginFrame(args);
@@ -246,22 +259,24 @@
 
 void TestLayerTreeFrameSink::ReclaimResources(
     std::vector<viz::ReturnedResource> resources) {
+  DebugScopedSetImplThread impl(task_runner_provider_);
   client_->ReclaimResources(std::move(resources));
 }
 
-void TestLayerTreeFrameSink::OnBeginFramePausedChanged(bool paused) {}
-
 void TestLayerTreeFrameSink::DisplayOutputSurfaceLost() {
+  DebugScopedSetImplThread impl(task_runner_provider_);
   client_->DidLoseLayerTreeFrameSink();
 }
 
 void TestLayerTreeFrameSink::DisplayWillDrawAndSwap(
     bool will_draw_and_swap,
     viz::AggregatedRenderPassList* render_passes) {
+  DebugScopedSetImplThread impl(task_runner_provider_);
   test_client_->DisplayWillDrawAndSwap(will_draw_and_swap, render_passes);
 }
 
 void TestLayerTreeFrameSink::DisplayDidDrawAndSwap() {
+  DebugScopedSetImplThread impl(task_runner_provider_);
   test_client_->DisplayDidDrawAndSwap();
 }
 
@@ -276,6 +291,7 @@
 }
 
 void TestLayerTreeFrameSink::SendCompositorFrameAckToClient() {
+  DebugScopedSetImplThread impl(task_runner_provider_);
   client_->DidReceiveCompositorFrameAck();
 }
 

cc/test/test_layer_tree_frame_sink.h

diff --git a/cc/test/test_layer_tree_frame_sink.h b/cc/test/test_layer_tree_frame_sink.h
index 8d3af8b6..6691b32 100644
--- a/cc/test/test_layer_tree_frame_sink.h
+++ b/cc/test/test_layer_tree_frame_sink.h
@@ -23,16 +23,14 @@
 #include "components/viz/test/test_shared_bitmap_manager.h"
 #include "services/viz/public/mojom/compositing/compositor_frame_sink.mojom.h"
 
-namespace base {
-class SingleThreadTaskRunner;
-}
-
 namespace viz {
 class CompositorFrameSinkSupport;
 }  // namespace viz
 
 namespace cc {
 
+class TaskRunnerProvider;
+
 class TestLayerTreeFrameSinkClient {
  public:
   virtual ~TestLayerTreeFrameSinkClient() {}
@@ -74,7 +72,7 @@
       gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
       const viz::RendererSettings& renderer_settings,
       const viz::DebugRendererSettings* debug_settings,
-      scoped_refptr<base::SingleThreadTaskRunner> task_runner,
+      TaskRunnerProvider* task_runner_provider,
       bool synchronous_composite,
       bool disable_display_vsync,
       double refresh_rate,
@@ -114,7 +112,7 @@
   void OnBeginFrame(const viz::BeginFrameArgs& args,
                     const viz::FrameTimingDetailsMap& timing_details) override;
   void ReclaimResources(std::vector<viz::ReturnedResource> resources) override;
-  void OnBeginFramePausedChanged(bool paused) override;
+  void OnBeginFramePausedChanged(bool paused) override {}
   void OnCompositorFrameTransitionDirectiveProcessed(
       uint32_t sequence_id) override {}
 
@@ -176,6 +174,8 @@
   raw_ptr<TestLayerTreeFrameSinkClient> test_client_ = nullptr;
   gfx::Size enlarge_pass_texture_amount_;
 
+  TaskRunnerProvider* task_runner_provider_;
+
   // The set of SharedBitmapIds that have been reported as allocated to this
   // interface. On closing this interface, the display compositor should drop
   // ownership of the bitmaps with these ids to avoid leaking them.

cc/trees/layer_tree_host.cc

diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc
index 8a286f5c..07460bb 100644
--- a/cc/trees/layer_tree_host.cc
+++ b/cc/trees/layer_tree_host.cc
@@ -234,6 +234,7 @@
 void LayerTreeHost::InitializeProxy(std::unique_ptr<Proxy> proxy) {
   TRACE_EVENT0("cc", "LayerTreeHost::InitializeForReal");
   DCHECK(task_runner_provider_);
+  DCHECK(IsMainThread());
 
   proxy_ = std::move(proxy);
   proxy_->Start();
@@ -265,7 +266,6 @@
     std::move(pair.second).Run(false);
 
   if (proxy_) {
-    DCHECK(task_runner_provider_->IsMainThread());
     proxy_->Stop();
 
     // Proxy must be destroyed before the Task Runner Provider.
@@ -278,11 +278,11 @@
 }
 
 int LayerTreeHost::SourceFrameNumber() const {
-  DCHECK(task_runner_provider_->IsMainThread());
   return pending_commit_state()->source_frame_number;
 }
 
 UIResourceManager* LayerTreeHost::GetUIResourceManager() {
+  DCHECK(IsMainThread());
   return ui_resource_manager_.get();
 }
 
@@ -290,31 +290,45 @@
   return task_runner_provider_.get();
 }
 
+bool LayerTreeHost::IsMainThread() const {
+  return task_runner_provider_ && task_runner_provider_->IsMainThread();
+}
+
+bool LayerTreeHost::IsImplThread() const {
+  return task_runner_provider_ && task_runner_provider_->IsImplThread();
+}
+
 SwapPromiseManager* LayerTreeHost::GetSwapPromiseManager() {
+  DCHECK(IsMainThread());
   return &swap_promise_manager_;
 }
 
 std::unique_ptr<EventsMetricsManager::ScopedMonitor>
 LayerTreeHost::GetScopedEventMetricsMonitor(
     EventsMetricsManager::ScopedMonitor::DoneCallback done_callback) {
+  DCHECK(IsMainThread());
   return events_metrics_manager_.GetScopedMonitor(std::move(done_callback));
 }
 
 void LayerTreeHost::ClearEventsMetrics() {
   // Take events metrics and drop them.
+  DCHECK(IsMainThread());
   events_metrics_manager_.TakeSavedEventsMetrics();
 }
 
 const LayerTreeSettings& LayerTreeHost::GetSettings() const {
+  DCHECK(IsMainThread());
   return settings_;
 }
 
 void LayerTreeHost::QueueSwapPromise(
     std::unique_ptr<SwapPromise> swap_promise) {
+  DCHECK(IsMainThread());
   swap_promise_manager_.QueueSwapPromise(std::move(swap_promise));
 }
 
 void LayerTreeHost::WillBeginMainFrame() {
+  DCHECK(IsMainThread());
   inside_main_frame_ = true;
   devtools_instrumentation::WillBeginMainThreadFrame(GetId(),
                                                      SourceFrameNumber());
@@ -322,19 +336,23 @@
 }
 
 void LayerTreeHost::DidBeginMainFrame() {
+  DCHECK(IsMainThread());
   inside_main_frame_ = false;
   client_->DidBeginMainFrame();
 }
 
 void LayerTreeHost::BeginMainFrameNotExpectedSoon() {
+  DCHECK(IsMainThread());
   client_->BeginMainFrameNotExpectedSoon();
 }
 
 void LayerTreeHost::BeginMainFrameNotExpectedUntil(base::TimeTicks time) {
+  DCHECK(IsMainThread());
   client_->BeginMainFrameNotExpectedUntil(time);
 }
 
 void LayerTreeHost::BeginMainFrame(const viz::BeginFrameArgs& args) {
+  DCHECK(IsMainThread());
   client_->BeginMainFrame(args);
 }
 
@@ -343,6 +361,7 @@
 }
 
 void LayerTreeHost::RequestMainFrameUpdate(bool report_metrics) {
+  DCHECK(IsMainThread());
   client_->UpdateLayerTreeHost();
   if (report_metrics)
     pending_commit_state()->begin_main_frame_metrics =
@@ -353,6 +372,7 @@
 
 void LayerTreeHost::ImageDecodesFinished(
     const std::vector<std::pair<int, bool>>& results) {
+  DCHECK(IsMainThread());
   // Issue stored callbacks and remove them from the pending list.
   for (const auto& pair : results) {
     auto it = pending_image_decodes_.find(pair.first);
@@ -363,13 +383,13 @@
 }
 
 void LayerTreeHost::SetNextCommitWaitsForActivation() {
-  DCHECK(task_runner_provider_->IsMainThread());
   pending_commit_state()->commit_waits_for_activation = true;
 }
 
 std::unique_ptr<CommitState> LayerTreeHost::WillCommit(
     std::unique_ptr<CompletionEvent> completion,
     bool has_updates) {
+  DCHECK(IsMainThread());
   DCHECK(!commit_completion_event_);
   commit_completion_event_ = std::move(completion);
   std::unique_ptr<CommitState> result;
@@ -382,6 +402,7 @@
 }
 
 std::unique_ptr<CommitState> LayerTreeHost::ActivateCommitState() {
+  DCHECK(IsMainThread());
   DCHECK(pending_commit_state());
 
   // Pull state not stored directly on LayerTreeHost
@@ -402,7 +423,7 @@
 }
 
 void LayerTreeHost::WaitForCommitCompletion() {
-  DCHECK(task_runner_provider_->IsMainThread());
+  DCHECK(IsMainThread());
   if (commit_completion_event_) {
     commit_completion_event_->Wait();
     commit_completion_event_ = nullptr;
@@ -410,6 +431,7 @@
 }
 
 void LayerTreeHost::UpdateDeferMainFrameUpdateInternal() {
+  DCHECK(IsMainThread());
   proxy_->SetDeferMainFrameUpdate(
       defer_main_frame_update_count_ > 0 ||
       !pending_commit_state()->local_surface_id_from_parent.is_valid());
@@ -421,6 +443,7 @@
 
 void LayerTreeHost::CommitComplete(const CommitTimestamps& commit_timestamps) {
   // This DCHECK ensures that WaitForCommitCompletion() will not block.
+  DCHECK(IsMainThread());
   DCHECK(!in_commit());
   WaitForCommitCompletion();
   client_->DidCommit(commit_timestamps.start, commit_timestamps.finish);
@@ -432,6 +455,7 @@
 
 void LayerTreeHost::NotifyTransitionRequestsFinished(
     const std::vector<uint32_t>& sequence_ids) {
+  DCHECK(IsMainThread());
   // TODO(vmpstr): This might also be a good spot to expire long standing
   // requests if they were not finished.
   for (auto& sequence_id : sequence_ids) {
@@ -445,6 +469,7 @@
 
 void LayerTreeHost::SetLayerTreeFrameSink(
     std::unique_ptr<LayerTreeFrameSink> surface) {
+  DCHECK(IsMainThread());
   TRACE_EVENT0("cc", "LayerTreeHost::SetLayerTreeFrameSink");
   DCHECK(surface);
 
@@ -454,6 +479,7 @@
 }
 
 std::unique_ptr<LayerTreeFrameSink> LayerTreeHost::ReleaseLayerTreeFrameSink() {
+  DCHECK(IsMainThread());
   DCHECK(!visible_);
 
   DidLoseLayerTreeFrameSink();
@@ -462,16 +488,19 @@
 }
 
 void LayerTreeHost::RequestNewLayerTreeFrameSink() {
+  DCHECK(IsMainThread());
   client_->RequestNewLayerTreeFrameSink();
 }
 
 void LayerTreeHost::DidInitializeLayerTreeFrameSink() {
+  DCHECK(IsMainThread());
   DCHECK(new_layer_tree_frame_sink_);
   current_layer_tree_frame_sink_ = std::move(new_layer_tree_frame_sink_);
   client_->DidInitializeLayerTreeFrameSink();
 }
 
 void LayerTreeHost::DidFailToInitializeLayerTreeFrameSink() {
+  DCHECK(IsMainThread());
   DCHECK(new_layer_tree_frame_sink_);
   // Note: It is safe to drop all output surface references here as
   // LayerTreeHostImpl will not keep a pointer to either the old or
@@ -487,7 +516,7 @@
   // runs on the impl thread. As such, it cannot use LayerTreeHost getter
   // methods that enforce DCHECK(IsMainThread()). Because it only ever runs when
   // the main thread is blocked, it's safe to access member variables directly.
-  DCHECK(task_runner_provider_->IsImplThread());
+  DCHECK(IsImplThread());
   DCHECK(task_runner_provider_->IsMainThreadBlocked());
   return CreateLayerTreeHostImplInternal(
       client, thread_unsafe_commit_state_.mutator_host, settings_,
@@ -557,51 +586,61 @@
 
 std::unique_ptr<ScopedDeferMainFrameUpdate>
 LayerTreeHost::DeferMainFrameUpdate() {
+  DCHECK(IsMainThread());
   return std::make_unique<ScopedDeferMainFrameUpdate>(this);
 }
 
 void LayerTreeHost::OnDeferMainFrameUpdatesChanged(bool defer_status) {
+  DCHECK(IsMainThread());
   client_->OnDeferMainFrameUpdatesChanged(defer_status);
 }
 
 bool LayerTreeHost::StartDeferringCommits(base::TimeDelta timeout,
                                           PaintHoldingReason reason) {
+  DCHECK(IsMainThread());
   return proxy_->StartDeferringCommits(timeout, reason);
 }
 
 void LayerTreeHost::StopDeferringCommits(PaintHoldingCommitTrigger trigger) {
+  DCHECK(IsMainThread());
   proxy_->StopDeferringCommits(trigger);
 }
 
 bool LayerTreeHost::IsDeferringCommits() const {
+  DCHECK(IsMainThread());
   return proxy_->IsDeferringCommits();
 }
 
 void LayerTreeHost::OnDeferCommitsChanged(bool defer_status,
                                           PaintHoldingReason reason) {
+  DCHECK(IsMainThread());
   client_->OnDeferCommitsChanged(defer_status, reason);
 }
 
 DISABLE_CFI_PERF
 void LayerTreeHost::SetNeedsAnimate() {
+  DCHECK(IsMainThread());
   proxy_->SetNeedsAnimate();
   swap_promise_manager_.NotifyLatencyInfoSwapPromiseMonitors();
   events_metrics_manager_.SaveActiveEventMetrics();
 }
 
 void LayerTreeHost::SetNeedsAnimateIfNotInsideMainFrame() {
+  DCHECK(IsMainThread());
   if (!inside_main_frame_)
     SetNeedsAnimate();
 }
 
 DISABLE_CFI_PERF
 void LayerTreeHost::SetNeedsUpdateLayers() {
+  DCHECK(IsMainThread());
   proxy_->SetNeedsUpdateLayers();
   swap_promise_manager_.NotifyLatencyInfoSwapPromiseMonitors();
   events_metrics_manager_.SaveActiveEventMetrics();
 }
 
 void LayerTreeHost::SetNeedsCommit() {
+  DCHECK(IsMainThread());
   proxy_->SetNeedsCommit();
   swap_promise_manager_.NotifyLatencyInfoSwapPromiseMonitors();
   events_metrics_manager_.SaveActiveEventMetrics();
@@ -609,10 +648,12 @@
 
 void LayerTreeHost::SetTargetLocalSurfaceId(
     const viz::LocalSurfaceId& target_local_surface_id) {
+  DCHECK(IsMainThread());
   proxy_->SetTargetLocalSurfaceId(target_local_surface_id);
 }
 
 bool LayerTreeHost::RequestedMainFramePending() const {
+  DCHECK(IsMainThread());
   return proxy_->RequestedAnimatePending();
 }
 
@@ -622,10 +663,12 @@
 }
 
 void LayerTreeHost::SetNeedsRedrawRect(const gfx::Rect& damage_rect) {
+  DCHECK(IsMainThread());
   proxy_->SetNeedsRedraw(damage_rect);
 }
 
 bool LayerTreeHost::CommitRequested() const {
+  DCHECK(IsMainThread());
   return proxy_->CommitRequested();
 }
 
@@ -651,6 +694,7 @@
 }
 
 void LayerTreeHost::ApplyPageScaleDeltaFromImplSide(float page_scale_delta) {
+  DCHECK(IsMainThread());
   DCHECK(CommitRequested());
   if (page_scale_delta == 1.f)
     return;
@@ -660,6 +704,7 @@
 }
 
 void LayerTreeHost::SetVisible(bool visible) {
+  DCHECK(IsMainThread());
   if (visible_ == visible)
     return;
   visible_ = visible;
@@ -667,6 +712,7 @@
 }
 
 bool LayerTreeHost::IsVisible() const {
+  DCHECK(IsMainThread());
   return visible_;
 }
 
@@ -722,12 +768,14 @@
     uint32_t frame_token,
     std::vector<PresentationTimeCallbackBuffer::MainCallback> callbacks,
     const gfx::PresentationFeedback& feedback) {
+  DCHECK(IsMainThread());
   for (auto& callback : callbacks)
     std::move(callback).Run(feedback);
   client_->DidPresentCompositorFrame(frame_token, feedback);
 }
 
 void LayerTreeHost::DidCompletePageScaleAnimation() {
+  DCHECK(IsMainThread());
   did_complete_scale_animation_ = true;
 }
 
@@ -739,6 +787,7 @@
 }
 
 bool LayerTreeHost::CaptureContent(std::vector<NodeInfo>* content) const {
+  DCHECK(IsMainThread());
   if (visual_device_viewport_intersection_rect_.IsEmpty())
     return false;
 
@@ -756,6 +805,7 @@
 void LayerTreeHost::DidObserveFirstScrollDelay(
     base::TimeDelta first_scroll_delay,
     base::TimeTicks first_scroll_timestamp) {
+  DCHECK(IsMainThread());
   client_->DidObserveFirstScrollDelay(first_scroll_delay,
                                       first_scroll_timestamp);
 }
@@ -774,6 +824,7 @@
 }
 
 bool LayerTreeHost::DoUpdateLayers() {
+  DCHECK(IsMainThread());
   TRACE_EVENT1("cc,benchmark", "LayerTreeHost::DoUpdateLayers",
                "source_frame_number", SourceFrameNumber());
 
@@ -835,6 +886,7 @@
 
 void LayerTreeHost::ApplyViewportChanges(
     const CompositorCommitData& commit_data) {
+  DCHECK(IsMainThread());
   gfx::Vector2dF inner_viewport_scroll_delta;
   if (commit_data.inner_viewport_scroll.element_id)
     inner_viewport_scroll_delta =
@@ -935,6 +987,7 @@
 }
 
 void LayerTreeHost::ApplyCompositorChanges(CompositorCommitData* commit_data) {
+  DCHECK(IsMainThread());
   DCHECK(commit_data);
   TRACE_EVENT0("cc", "LayerTreeHost::ApplyCompositorChanges");
 
@@ -975,34 +1028,39 @@
 }
 
 void LayerTreeHost::ApplyMutatorEvents(std::unique_ptr<MutatorEvents> events) {
-  DCHECK(task_runner_provider_->IsMainThread());
+  DCHECK(IsMainThread());
   if (!events->IsEmpty())
     mutator_host()->SetAnimationEvents(std::move(events));
 }
 
 void LayerTreeHost::RecordStartOfFrameMetrics() {
+  DCHECK(IsMainThread());
   client_->RecordStartOfFrameMetrics();
 }
 
 void LayerTreeHost::RecordEndOfFrameMetrics(
     base::TimeTicks frame_begin_time,
     ActiveFrameSequenceTrackers trackers) {
+  DCHECK(IsMainThread());
   client_->RecordEndOfFrameMetrics(frame_begin_time, trackers);
 }
 
 void LayerTreeHost::NotifyThroughputTrackerResults(
     CustomTrackerResults results) {
+  DCHECK(IsMainThread());
   client_->NotifyThroughputTrackerResults(std::move(results));
 }
 
 const base::WeakPtr<CompositorDelegateForInput>&
 LayerTreeHost::GetDelegateForInput() const {
+  DCHECK(IsMainThread());
   return compositor_delegate_weak_ptr_;
 }
 
 void LayerTreeHost::UpdateBrowserControlsState(BrowserControlsState constraints,
                                                BrowserControlsState current,
                                                bool animate) {
+  DCHECK(IsMainThread());
   // Browser controls are only used in threaded mode but Blink layout tests may
   // call into this. The single threaded version is a no-op.
   proxy_->UpdateBrowserControlsState(constraints, current, animate);
@@ -1030,16 +1088,19 @@
     const std::string& benchmark_name,
     base::Value settings,
     MicroBenchmark::DoneCallback callback) {
+  DCHECK(IsMainThread());
   return micro_benchmark_controller_.ScheduleRun(
       benchmark_name, std::move(settings), std::move(callback));
 }
 
 bool LayerTreeHost::SendMessageToMicroBenchmark(int id, base::Value message) {
+  DCHECK(IsMainThread());
   return micro_benchmark_controller_.SendMessage(id, std::move(message));
 }
 
 void LayerTreeHost::SetLayerTreeMutator(
     std::unique_ptr<LayerTreeMutator> mutator) {
+  DCHECK(IsMainThread());
   // The animation worklet system assumes that the mutator will never be called
   // from the main thread, which will not be the case if we're running in
   // single-threaded mode.
@@ -1052,6 +1113,7 @@
 
 void LayerTreeHost::SetPaintWorkletLayerPainter(
     std::unique_ptr<PaintWorkletLayerPainter> painter) {
+  DCHECK(IsMainThread());
   // The paint worklet system assumes that the painter will never be called from
   // the main thread, which will not be the case if we're running in
   // single-threaded mode.
@@ -1061,12 +1123,14 @@
 }
 
 bool LayerTreeHost::IsSingleThreaded() const {
+  DCHECK(IsMainThread());
   DCHECK(compositor_mode_ != CompositorMode::SINGLE_THREADED ||
          !task_runner_provider_->HasImplThread());
   return compositor_mode_ == CompositorMode::SINGLE_THREADED;
 }
 
 bool LayerTreeHost::IsThreaded() const {
+  DCHECK(IsMainThread());
   DCHECK(compositor_mode_ != CompositorMode::THREADED ||
          task_runner_provider_->HasImplThread());
   return compositor_mode_ == CompositorMode::THREADED;
@@ -1080,6 +1144,7 @@
 
 void LayerTreeHost::RequestScrollAnimationEndNotification(
     base::OnceClosure callback) {
+  DCHECK(IsMainThread());
   DCHECK(scroll_animation_.end_notification.is_null());
   if (scroll_animation_.in_progress)
     scroll_animation_.end_notification = std::move(callback);
@@ -1218,6 +1283,7 @@
 
 void LayerTreeHost::SetVisualDeviceViewportIntersectionRect(
     const gfx::Rect& intersection_rect) {
+  DCHECK(IsMainThread());
   if (intersection_rect == visual_device_viewport_intersection_rect_)
     return;
 
@@ -1303,6 +1369,7 @@
 }
 
 void LayerTreeHost::SetRecordingScaleFactor(float recording_scale_factor) {
+  DCHECK(IsMainThread());
   if (recording_scale_factor_ == recording_scale_factor)
     return;
   recording_scale_factor_ = recording_scale_factor;
@@ -1432,6 +1499,7 @@
 }
 
 void LayerTreeHost::RegisterLayer(Layer* layer) {
+  DCHECK(IsMainThread());
   DCHECK(!LayerById(layer->id()));
   DCHECK(!in_paint_layer_contents_);
   layer_id_map_[layer->id()] = layer;
@@ -1442,6 +1510,7 @@
 }
 
 void LayerTreeHost::UnregisterLayer(Layer* layer) {
+  DCHECK(IsMainThread());
   DCHECK(LayerById(layer->id()));
   DCHECK(!in_paint_layer_contents_);
   if (!IsUsingLayerLists() && layer->element_id()) {
@@ -1453,11 +1522,13 @@
 }
 
 Layer* LayerTreeHost::LayerById(int id) {
+  DCHECK(IsMainThread());
   auto iter = layer_id_map_.find(id);
   return iter != layer_id_map_.end() ? iter->second : nullptr;
 }
 
 bool LayerTreeHost::PaintContent(const LayerList& update_layer_list) {
+  DCHECK(IsMainThread());
   base::AutoReset<bool> painting(&in_paint_layer_contents_, true);
   bool did_paint_content = false;
   for (const auto& layer : update_layer_list) {
@@ -1554,23 +1625,27 @@
 }
 
 Layer* LayerTreeHost::LayerByElementId(ElementId element_id) {
+  DCHECK(IsMainThread());
   auto iter = element_layers_map_.find(element_id);
   return iter != element_layers_map_.end() ? iter->second : nullptr;
 }
 
 const Layer* LayerTreeHost::LayerByElementId(ElementId element_id) const {
+  DCHECK(IsMainThread());
   auto iter = element_layers_map_.find(element_id);
   return iter != element_layers_map_.end() ? iter->second : nullptr;
 }
 
 void LayerTreeHost::RegisterElement(ElementId element_id,
                                     Layer* layer) {
+  DCHECK(IsMainThread());
   element_layers_map_[element_id] = layer;
   if (!IsUsingLayerLists())
     mutator_host()->RegisterElementId(element_id, ElementListType::ACTIVE);
 }
 
 void LayerTreeHost::UnregisterElement(ElementId element_id) {
+  DCHECK(IsMainThread());
   if (!IsUsingLayerLists())
     mutator_host()->UnregisterElementId(element_id, ElementListType::ACTIVE);
   element_layers_map_.erase(element_id);
@@ -1592,6 +1667,7 @@
 
 bool LayerTreeHost::IsElementInPropertyTrees(ElementId element_id,
                                              ElementListType list_type) const {
+  DCHECK(IsMainThread());
   if (IsUsingLayerLists()) {
     return list_type == ElementListType::ACTIVE &&
            property_trees()->HasElement(element_id);
@@ -1699,6 +1775,7 @@
     ElementId element_id,
     ElementListType list_type,
     const gfx::PointF& scroll_offset) {
+  DCHECK(IsMainThread());
   // Do nothing. Scroll deltas will be sent from the compositor thread back
   // to the main thread in the same manner as during non-animated
   // compositor-driven scrolling.
@@ -1721,6 +1798,10 @@
   property_trees()->MaximumAnimationScaleChanged(element_id, maximum_scale);
 }
 
+bool LayerTreeHost::RunsOnCurrentThread() const {
+  return !task_runner_provider_ || task_runner_provider_->IsMainThread();
+}
+
 void LayerTreeHost::QueueImageDecode(const PaintImage& image,
                                      base::OnceCallback<void(bool)> callback) {
   TRACE_EVENT0("cc", "LayerTreeHost::QueueImageDecode");
@@ -1736,22 +1817,27 @@
 }
 
 LayerListConstIterator LayerTreeHost::begin() const {
+  DCHECK(IsMainThread());
   return LayerListConstIterator(root_layer());
 }
 
 LayerListIterator LayerTreeHost::end() {
+  DCHECK(IsMainThread());
   return LayerListIterator(nullptr);
 }
 
 LayerListConstIterator LayerTreeHost::end() const {
+  DCHECK(IsMainThread());
   return LayerListConstIterator(nullptr);
 }
 
 LayerListReverseIterator LayerTreeHost::rbegin() {
+  DCHECK(IsMainThread());
   return LayerListReverseIterator(root_layer());
 }
 
 LayerListReverseConstIterator LayerTreeHost::rbegin() const {
+  DCHECK(IsMainThread());
   return LayerListReverseConstIterator(root_layer());
 }
 
@@ -1774,14 +1860,17 @@
 }
 
 void LayerTreeHost::SetHasCopyRequest(bool has_copy_request) {
+  DCHECK(IsMainThread());
   has_copy_request_ = has_copy_request;
 }
 
 void LayerTreeHost::RequestBeginMainFrameNotExpected(bool new_state) {
+  DCHECK(IsMainThread());
   proxy_->RequestBeginMainFrameNotExpected(new_state);
 }
 
 void LayerTreeHost::SetSourceURL(ukm::SourceId source_id, const GURL& url) {
+  DCHECK(IsMainThread());
   // Clears image caches and resets the scheduling history for the content
   // produced by this host so far.
   pending_commit_state()->clear_caches_on_next_commit = true;
@@ -1793,6 +1882,7 @@
 
 base::ReadOnlySharedMemoryRegion
 LayerTreeHost::CreateSharedMemoryForSmoothnessUkm() {
+  DCHECK(IsMainThread());
   const auto size = sizeof(UkmSmoothnessDataShared);
   auto ukm_smoothness_mapping = base::ReadOnlySharedMemoryRegion::Create(size);
   if (!ukm_smoothness_mapping.IsValid())
@@ -1804,11 +1894,13 @@
 
 void LayerTreeHost::SetRenderFrameObserver(
     std::unique_ptr<RenderFrameMetadataObserver> observer) {
+  DCHECK(IsMainThread());
   proxy_->SetRenderFrameObserver(std::move(observer));
 }
 
 void LayerTreeHost::SetEnableFrameRateThrottling(
     bool enable_frame_rate_throttling) {
+  DCHECK(IsMainThread());
   proxy_->SetEnableFrameRateThrottling(enable_frame_rate_throttling);
 }
 
@@ -1820,6 +1912,7 @@
 
 std::vector<base::OnceClosure>
 LayerTreeHost::TakeDocumentTransitionCallbacksForTesting() {
+  DCHECK(IsMainThread());
   std::vector<base::OnceClosure> result;
   for (auto& item : document_transition_callbacks_)
     result.push_back(std::move(item.second));
@@ -1828,6 +1921,7 @@
 }
 
 uint32_t LayerTreeHost::GetAverageThroughput() const {
+  DCHECK(IsMainThread());
   return proxy_->GetAverageThroughput();
 }
 

cc/trees/layer_tree_host.h

diff --git a/cc/trees/layer_tree_host.h b/cc/trees/layer_tree_host.h
index 23c6b4a..032ffbe 100644
--- a/cc/trees/layer_tree_host.h
+++ b/cc/trees/layer_tree_host.h
@@ -157,7 +157,7 @@
 
   // The commit state for the frame being assembled by the compositor host.
   const CommitState* pending_commit_state() const {
-    DCHECK(task_runner_provider_->IsMainThread());
+    DCHECK(IsMainThread());
     return pending_commit_state_.get();
   }
 
@@ -165,7 +165,7 @@
   // state is *not* snapshotted. Both the compositor and the host access a
   // single live version, so care must be taken to avoid collisions.
   const ThreadUnsafeCommitState& thread_unsafe_commit_state() const {
-    // TODO(szager): DCHECK(task_runner_provider_->IsMainThread());
+    DCHECK(IsMainThread());
     return thread_unsafe_commit_state_;
   }
   // This should only be used to get a reference to ThreadUnsafeCommitState for
@@ -185,9 +185,10 @@
   // UIResourceLayers pushed to the LayerTree.
   UIResourceManager* GetUIResourceManager();
 
-  // Returns the TaskRunnerProvider used to access the main and compositor
-  // thread task runners.
+  // These methods are safe to call from either thread.
   TaskRunnerProvider* GetTaskRunnerProvider();
+  bool IsMainThread() const;
+  bool IsImplThread() const;
 
   // Returns the settings used by this host. These settings are constants given
   // at startup.
@@ -219,6 +220,7 @@
   void ClearEventsMetrics();
 
   size_t saved_events_metrics_count_for_testing() const {
+    DCHECK(IsMainThread());
     return events_metrics_manager_.saved_events_metrics_count_for_testing();
   }
 
@@ -317,6 +319,7 @@
   // though commits may be deferred also when the local_surface_id_from_parent()
   // is not valid.
   bool defer_main_frame_update() const {
+    DCHECK(IsMainThread());
     return defer_main_frame_update_count_;
   }
 
@@ -429,7 +432,7 @@
                                   EventListenerProperties event_properties);
   EventListenerProperties event_listener_properties(
       EventListenerClass event_class) const {
-    DCHECK(task_runner_provider_->IsMainThread());
+    DCHECK(IsMainThread());
     return pending_commit_state()
         ->event_listener_properties[static_cast<size_t>(event_class)];
   }
@@ -554,6 +557,7 @@
   }
 
   bool HasCompositorDrivenScrollAnimationForTesting() const {
+    DCHECK(IsMainThread());
     return scroll_animation_.in_progress;
   }
 
@@ -601,14 +605,21 @@
   Layer* LayerById(int id);
 
   bool PaintContent(const LayerList& update_layer_list);
-  bool in_paint_layer_contents() const { return in_paint_layer_contents_; }
+  bool in_paint_layer_contents() const {
+    DCHECK(IsMainThread());
+    return in_paint_layer_contents_;
+  }
 
   bool in_commit() const {
+    DCHECK(IsMainThread());
     return commit_completion_event_ && !commit_completion_event_->IsSignaled();
   }
 
   void SetHasCopyRequest(bool has_copy_request);
-  bool has_copy_request() const { return has_copy_request_; }
+  bool has_copy_request() const {
+    DCHECK(IsMainThread());
+    return has_copy_request_;
+  }
 
   void AddSurfaceRange(const viz::SurfaceRange& surface_range);
   void RemoveSurfaceRange(const viz::SurfaceRange& surface_range);
@@ -627,8 +638,14 @@
   // Ensures a HUD layer exists if it is needed, and updates the HUD bounds and
   // position. If a HUD layer exists but is no longer needed, it is destroyed.
   void UpdateHudLayer(bool show_hud_info);
-  HeadsUpDisplayLayer* hud_layer() { return hud_layer_.get(); }
-  const HeadsUpDisplayLayer* hud_layer() const { return hud_layer_.get(); }
+  HeadsUpDisplayLayer* hud_layer() {
+    DCHECK(IsMainThread());
+    return hud_layer_.get();
+  }
+  const HeadsUpDisplayLayer* hud_layer() const {
+    DCHECK(IsMainThread());
+    return hud_layer_.get();
+  }
   bool is_hud_layer(const Layer*) const;
 
   virtual void SetNeedsFullTreeSync();
@@ -686,8 +703,12 @@
   std::unique_ptr<LayerTreeHostImpl> CreateLayerTreeHostImpl(
       LayerTreeHostImplClient* client);
   void DidLoseLayerTreeFrameSink();
-  void DidCommitAndDrawFrame() { client_->DidCommitAndDrawFrame(); }
+  void DidCommitAndDrawFrame() {
+    DCHECK(IsMainThread());
+    client_->DidCommitAndDrawFrame();
+  }
   void DidReceiveCompositorFrameAck() {
+    DCHECK(IsMainThread());
     client_->DidReceiveCompositorFrameAck();
   }
   bool UpdateLayers();
@@ -706,18 +727,26 @@
   void NotifyTransitionRequestsFinished(
       const std::vector<uint32_t>& sequence_ids);
 
-  LayerTreeHostClient* client() { return client_; }
+  LayerTreeHostClient* client() {
+    DCHECK(IsMainThread());
+    return client_;
+  }
   LayerTreeHostSchedulingClient* scheduling_client() {
+    DCHECK(IsMainThread());
     return scheduling_client_;
   }
 
   void CollectRenderingStats(RenderingStats* stats) const;
 
   RenderingStatsInstrumentation* rendering_stats_instrumentation() const {
+    DCHECK(IsMainThread());
     return rendering_stats_instrumentation_.get();
   }
 
-  Proxy* proxy() { return proxy_.get(); }
+  Proxy* proxy() {
+    DCHECK(IsMainThread());
+    return proxy_.get();
+  }
 
   bool IsSingleThreaded() const;
   bool IsThreaded() const;
@@ -761,6 +790,8 @@
       PaintWorkletInput::PropertyKey property_key,
       PaintWorkletInput::PropertyValue property_value) override {}
 
+  bool RunsOnCurrentThread() const override;
+
   void ScrollOffsetAnimationFinished() override {}
 
   void NotifyAnimationWorkletStateChange(AnimationWorkletMutationState state,
@@ -772,7 +803,10 @@
 
   void RequestBeginMainFrameNotExpected(bool new_state);
 
-  float recording_scale_factor() const { return recording_scale_factor_; }
+  float recording_scale_factor() const {
+    DCHECK(IsMainThread());
+    return recording_scale_factor_;
+  }
 
   void SetSourceURL(ukm::SourceId source_id, const GURL& url);
   base::ReadOnlySharedMemoryRegion CreateSharedMemoryForSmoothnessUkm();
@@ -822,15 +856,17 @@
 
   // task_graph_runner() returns a valid value only until the LayerTreeHostImpl
   // is created in CreateLayerTreeHostImpl().
-  TaskGraphRunner* task_graph_runner() const { return task_graph_runner_; }
-
+  TaskGraphRunner* task_graph_runner() const {
+    DCHECK(IsMainThread());
+    return task_graph_runner_;
+  }
   CommitState* pending_commit_state() {
     DCHECK(task_runner_provider_->IsMainThread());
     return pending_commit_state_.get();
   }
   ThreadUnsafeCommitState& thread_unsafe_commit_state() {
-    // TODO(szager): DCHECK(task_runner_provider_->IsMainThread());
-    // TODO(szager): WaitForCommitCompletion();
+    DCHECK(IsMainThread());
+    WaitForCommitCompletion();
     return thread_unsafe_commit_state_;
   }
 
@@ -847,6 +883,7 @@
 
  private:
   friend class LayerTreeHostSerializationTest;
+  friend class LayerTreeTest;
   friend class ScopedDeferMainFrameUpdate;
 
   // This is the number of consecutive frames in which we want the content to be

cc/trees/layer_tree_host_impl.cc

diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index 54f68fd2..c13c064 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -466,6 +466,8 @@
   SetDebugState(settings.initial_debug_state);
   compositor_frame_reporting_controller_->SetDroppedFrameCounter(
       &dropped_frame_counter_);
+  compositor_frame_reporting_controller_->SetFrameSequenceTrackerCollection(
+      &frame_trackers_);
 
 #if BUILDFLAG(IS_CHROMEOS_ASH)
   const bool is_ui = settings.is_layer_tree_for_ui;
@@ -4930,6 +4932,12 @@
                                                  std::move(property_value));
 }
 
+bool LayerTreeHostImpl::RunsOnCurrentThread() const {
+  // If there is no impl thread, then we assume the current thread is ok.
+  return !task_runner_provider_->HasImplThread() ||
+         task_runner_provider_->IsImplThread();
+}
+
 void LayerTreeHostImpl::SetElementBackdropFilterMutated(
     ElementId element_id,
     ElementListType list_type,

cc/trees/layer_tree_host_impl.h

diff --git a/cc/trees/layer_tree_host_impl.h b/cc/trees/layer_tree_host_impl.h
index 0a76f24..db4cb52 100644
--- a/cc/trees/layer_tree_host_impl.h
+++ b/cc/trees/layer_tree_host_impl.h
@@ -162,8 +162,6 @@
   // Called when a requested image decode completes.
   virtual void NotifyImageDecodeRequestFinished() = 0;
 
-  virtual void RequestBeginMainFrameNotExpected(bool new_state) = 0;
-
   // Called when a presentation time is requested. |frame_token| identifies
   // the frame that was presented. |callbacks| holds both impl side and main
   // side callbacks to be called.
@@ -469,6 +467,8 @@
       PaintWorkletInput::PropertyKey property_key,
       PaintWorkletInput::PropertyValue property_value) override;
 
+  bool RunsOnCurrentThread() const override;
+
   void ScrollOffsetAnimationFinished() override;
 
   void NotifyAnimationWorkletStateChange(AnimationWorkletMutationState state,
@@ -910,6 +910,7 @@
   // Virtual for testing.
   virtual bool AnimateLayers(base::TimeTicks monotonic_time,
                              bool is_active_tree);
+  void ImageDecodeFinished(int request_id, bool decode_succeeded);
 
   bool is_likely_to_require_a_draw() const {
     return is_likely_to_require_a_draw_;
@@ -1000,7 +1001,6 @@
 
  private:
   void SetContextVisibility(bool is_visible);
-  void ImageDecodeFinished(int request_id, bool decode_succeeded);
 
   void ShowScrollbarsForImplScroll(ElementId element_id);
 

cc/trees/layer_tree_host_impl_unittest.cc

diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc
index 873ef09..dec69314 100644
--- a/cc/trees/layer_tree_host_impl_unittest.cc
+++ b/cc/trees/layer_tree_host_impl_unittest.cc
@@ -268,7 +268,6 @@
     did_request_impl_side_invalidation_ = true;
   }
   void NotifyImageDecodeRequestFinished() override {}
-  void RequestBeginMainFrameNotExpected(bool new_state) override {}
   void DidPresentCompositorFrameOnImplThread(
       uint32_t frame_token,
       PresentationTimeCallbackBuffer::PendingCallbacks activated,
@@ -11681,11 +11680,12 @@
   constexpr double refresh_rate = 60.0;
   viz::RendererSettings renderer_settings = viz::RendererSettings();
   renderer_settings.use_skia_renderer = renderer_type() == RENDERER_SKIA;
+  std::unique_ptr<TaskRunnerProvider> task_runner_provider =
+      TaskRunnerProvider::Create(base::ThreadTaskRunnerHandle::Get(), nullptr);
   auto layer_tree_frame_sink = std::make_unique<TestLayerTreeFrameSink>(
       context_provider, viz::TestContextProvider::CreateWorker(), nullptr,
-      renderer_settings, &debug_settings_,
-      base::ThreadTaskRunnerHandle::Get().get(), synchronous_composite,
-      disable_display_vsync, refresh_rate);
+      renderer_settings, &debug_settings_, task_runner_provider.get(),
+      synchronous_composite, disable_display_vsync, refresh_rate);
   layer_tree_frame_sink->SetClient(&test_client);
 
   CreateHostImpl(DefaultSettings(), std::move(layer_tree_frame_sink));

cc/trees/layer_tree_host_perftest.cc

diff --git a/cc/trees/layer_tree_host_perftest.cc b/cc/trees/layer_tree_host_perftest.cc
index 903a482..963e4ffd 100644
--- a/cc/trees/layer_tree_host_perftest.cc
+++ b/cc/trees/layer_tree_host_perftest.cc
@@ -60,7 +60,7 @@
     return std::make_unique<TestLayerTreeFrameSink>(
         compositor_context_provider, std::move(worker_context_provider),
         gpu_memory_buffer_manager(), renderer_settings, &debug_settings_,
-        ImplThreadTaskRunner(), synchronous_composite, disable_display_vsync,
+        task_runner_provider(), synchronous_composite, disable_display_vsync,
         refresh_rate);
   }
 

cc/trees/layer_tree_host_unittest.cc

diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
index 42dadea3..10f4fc29 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc
@@ -113,9 +113,9 @@
 const char kMissingTiles[] = "NumMissingTiles";
 
 bool LayerSubtreeHasCopyRequest(Layer* layer) {
-  LayerTreeHost* host = layer->layer_tree_host();
+  const LayerTreeHost* host = layer->layer_tree_host();
   int index = layer->effect_tree_index();
-  auto* node = host->property_trees()->effect_tree.Node(index);
+  const auto* node = host->property_trees()->effect_tree.Node(index);
   return node->subtree_has_copy_request;
 }
 
@@ -2068,7 +2068,9 @@
 
   void WillCommit(const CommitState&) override {
     root_effect_tree_index_ =
-        layer_tree_host()->root_layer()->effect_tree_index();
+        const_cast<const LayerTreeHost*>(layer_tree_host())
+            ->root_layer()
+            ->effect_tree_index();
   }
 
   void DidCommit() override {
@@ -4345,7 +4347,7 @@
       gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
       const viz::RendererSettings& renderer_settings,
       const viz::DebugRendererSettings* const debug_settings,
-      base::SingleThreadTaskRunner* task_runner,
+      TaskRunnerProvider* task_runner_provider,
       bool synchronous_composite,
       double refresh_rate,
       base::RepeatingClosure invalidate_callback)
@@ -4354,7 +4356,7 @@
                                gpu_memory_buffer_manager,
                                renderer_settings,
                                debug_settings,
-                               task_runner,
+                               task_runner_provider,
                                synchronous_composite,
                                false /* disable_display_vsync */,
                                refresh_rate),
@@ -4394,7 +4396,7 @@
     auto frame_sink = std::make_unique<OnDrawLayerTreeFrameSink>(
         compositor_context_provider, std::move(worker_context_provider),
         gpu_memory_buffer_manager(), renderer_settings, &debug_settings_,
-        ImplThreadTaskRunner(), false /* synchronous_composite */, refresh_rate,
+        task_runner_provider(), false /* synchronous_composite */, refresh_rate,
         std::move(on_draw_callback));
     layer_tree_frame_sink_ = frame_sink.get();
     return std::move(frame_sink);
@@ -4436,7 +4438,7 @@
     auto frame_sink = std::make_unique<OnDrawLayerTreeFrameSink>(
         compositor_context_provider, std::move(worker_context_provider),
         gpu_memory_buffer_manager(), renderer_settings, &debug_settings_,
-        ImplThreadTaskRunner(),
+        task_runner_provider(),
         /*synchronous_composite=*/false, refresh_rate,
         /*invalidate_callback=*/base::DoNothing());
     return std::move(frame_sink);
@@ -7272,7 +7274,7 @@
     return std::make_unique<TestLayerTreeFrameSink>(
         compositor_context_provider, std::move(worker_context_provider),
         gpu_memory_buffer_manager(), renderer_settings, &debug_settings_,
-        ImplThreadTaskRunner(), synchronous_composite, disable_display_vsync,
+        task_runner_provider(), synchronous_composite, disable_display_vsync,
         refresh_rate);
   }
 

cc/trees/layer_tree_host_unittest_proxy.cc

diff --git a/cc/trees/layer_tree_host_unittest_proxy.cc b/cc/trees/layer_tree_host_unittest_proxy.cc
index 0a6bd7fc..92c066cc2 100644
--- a/cc/trees/layer_tree_host_unittest_proxy.cc
+++ b/cc/trees/layer_tree_host_unittest_proxy.cc
@@ -10,6 +10,7 @@
 #include "cc/trees/layer_tree_impl.h"
 #include "cc/trees/proxy_impl.h"
 #include "cc/trees/proxy_main.h"
+#include "cc/trees/single_thread_proxy.h"
 
 namespace cc {
 
@@ -471,14 +472,23 @@
   void CommitCompleteOnThread(LayerTreeHostImpl* host_impl) override {
     switch (host_impl->sync_tree()->source_frame_number()) {
       case 0: {
-        EXPECT_FALSE(proxy()->RequestedAnimatePending());
+        {
+          DebugScopedSetMainThread main(host_impl->task_runner_provider());
+          EXPECT_FALSE(proxy()->RequestedAnimatePending());
+        }
         host_impl->SetNeedsOneBeginImplFrame();
-        EXPECT_TRUE(proxy()->RequestedAnimatePending());
+        {
+          DebugScopedSetMainThread main(host_impl->task_runner_provider());
+          EXPECT_TRUE(proxy()->RequestedAnimatePending());
+        }
         PostSetNeedsCommitToMainThread();
         break;
       }
       case 1: {
-        EXPECT_FALSE(proxy()->RequestedAnimatePending());
+        {
+          DebugScopedSetMainThread main(host_impl->task_runner_provider());
+          EXPECT_FALSE(proxy()->RequestedAnimatePending());
+        }
         EndTest();
         break;
       }

cc/trees/layer_tree_host_unittest_scroll.cc

diff --git a/cc/trees/layer_tree_host_unittest_scroll.cc b/cc/trees/layer_tree_host_unittest_scroll.cc
index 65b4720..594b129 100644
--- a/cc/trees/layer_tree_host_unittest_scroll.cc
+++ b/cc/trees/layer_tree_host_unittest_scroll.cc
@@ -188,28 +188,29 @@
       : initial_scroll_(40, 10), scroll_amount_(-3, 17) {}
 
   void BeginTest() override {
-    scroll_layer_ = layer_tree_host()->OuterViewportScrollLayerForTesting();
-    SetScrollOffset(scroll_layer_.get(), initial_scroll_);
+    Layer* scroll_layer =
+        layer_tree_host()->OuterViewportScrollLayerForTesting();
+    scroll_layer_id_ = scroll_layer->id();
+    SetScrollOffset(scroll_layer, initial_scroll_);
     PostSetNeedsCommitToMainThread();
   }
 
-  void BeginCommitOnThread(LayerTreeHostImpl* impl) override {
+  void CommitCompleteOnThread(LayerTreeHostImpl* impl) override {
+    LayerImpl* layer_impl = impl->sync_tree()->LayerById(scroll_layer_id_);
     switch (impl->sync_tree()->source_frame_number()) {
       case 0:
-        EXPECT_POINTF_EQ(initial_scroll_,
-                         CurrentScrollOffset(scroll_layer_.get()));
+        EXPECT_POINTF_EQ(initial_scroll_, CurrentScrollOffset(layer_impl));
         break;
       case 1:
       case 2:
         EXPECT_POINTF_EQ(initial_scroll_ + scroll_amount_ + scroll_amount_,
-                         CurrentScrollOffset(scroll_layer_.get()));
+                         CurrentScrollOffset(layer_impl));
         break;
     }
   }
 
   void DrawLayersOnThread(LayerTreeHostImpl* impl) override {
-    LayerImpl* scroll_layer =
-        impl->active_tree()->LayerById(scroll_layer_->id());
+    LayerImpl* scroll_layer = impl->active_tree()->LayerById(scroll_layer_id_);
     if (impl->active_tree()->source_frame_number() == 0 &&
         impl->SourceAnimationFrameNumberForTesting() == 1) {
       // First draw after first commit.
@@ -226,15 +227,12 @@
       scroll_layer->ScrollBy(scroll_amount_);
       EXPECT_VECTOR2DF_EQ(scroll_amount_ + scroll_amount_,
                           ScrollDelta(scroll_layer));
-
-      EXPECT_POINTF_EQ(initial_scroll_,
-                       CurrentScrollOffset(scroll_layer_.get()));
       PostSetNeedsCommitToMainThread();
     } else if (impl->active_tree()->source_frame_number() == 1) {
       // Third or later draw after second commit.
       EXPECT_GE(impl->SourceAnimationFrameNumberForTesting(), 3u);
       EXPECT_POINTF_EQ(initial_scroll_ + scroll_amount_ + scroll_amount_,
-                       CurrentScrollOffset(scroll_layer_.get()));
+                       CurrentScrollOffset(scroll_layer));
       EndTest();
     }
   }
@@ -244,7 +242,7 @@
  private:
   gfx::PointF initial_scroll_;
   gfx::Vector2dF scroll_amount_;
-  scoped_refptr<Layer> scroll_layer_;
+  int scroll_layer_id_ = 0;
 };
 
 MULTI_THREAD_TEST_F(LayerTreeHostScrollTestScrollMultipleRedraw);

cc/trees/mutator_host_client.h

diff --git a/cc/trees/mutator_host_client.h b/cc/trees/mutator_host_client.h
index a9fa96a..c415828 100644
--- a/cc/trees/mutator_host_client.h
+++ b/cc/trees/mutator_host_client.h
@@ -74,6 +74,8 @@
   virtual void OnCustomPropertyMutated(
       PaintWorkletInput::PropertyKey property_key,
       PaintWorkletInput::PropertyValue property_value) = 0;
+
+  virtual bool RunsOnCurrentThread() const = 0;
 };
 
 }  // namespace cc

cc/trees/proxy_impl.cc

diff --git a/cc/trees/proxy_impl.cc b/cc/trees/proxy_impl.cc
index 16e1853..04e23e8 100644
--- a/cc/trees/proxy_impl.cc
+++ b/cc/trees/proxy_impl.cc
@@ -249,11 +249,11 @@
   completion->Signal();
 }
 
-void ProxyImpl::RequestBeginMainFrameNotExpected(bool new_state) {
+void ProxyImpl::RequestBeginMainFrameNotExpectedOnImpl(bool new_state) {
   DCHECK(IsImplThread());
   DCHECK(scheduler_);
-  TRACE_EVENT1("cc", "ProxyImpl::RequestBeginMainFrameNotExpected", "new_state",
-               new_state);
+  TRACE_EVENT1("cc", "ProxyImpl::RequestBeginMainFrameNotExpectedOnImpl",
+               "new_state", new_state);
   scheduler_->SetMainThreadWantsBeginMainFrameNotExpected(new_state);
 }
 

cc/trees/proxy_impl.h

diff --git a/cc/trees/proxy_impl.h b/cc/trees/proxy_impl.h
index c2f457a..8ed50079 100644
--- a/cc/trees/proxy_impl.h
+++ b/cc/trees/proxy_impl.h
@@ -84,8 +84,8 @@
 
   void MainFrameWillHappenOnImplForTesting(CompletionEvent* completion,
                                            bool* main_frame_will_happen);
+  void RequestBeginMainFrameNotExpectedOnImpl(bool new_state);
 
-  void RequestBeginMainFrameNotExpected(bool new_state) override;
   void ClearHistory() override;
   size_t CommitDurationSampleCountForTesting() const override;
 

cc/trees/proxy_main.cc

diff --git a/cc/trees/proxy_main.cc b/cc/trees/proxy_main.cc
index 07394e0..41982d0 100644
--- a/cc/trees/proxy_main.cc
+++ b/cc/trees/proxy_main.cc
@@ -682,7 +682,7 @@
   DCHECK(IsMainThread());
   ImplThreadTaskRunner()->PostTask(
       FROM_HERE,
-      base::BindOnce(&ProxyImpl::RequestBeginMainFrameNotExpected,
+      base::BindOnce(&ProxyImpl::RequestBeginMainFrameNotExpectedOnImpl,
                      base::Unretained(proxy_impl_.get()), new_state));
 }
 

cc/trees/single_thread_proxy.cc

diff --git a/cc/trees/single_thread_proxy.cc b/cc/trees/single_thread_proxy.cc
index 4f0d50c..a58b2c17 100644
--- a/cc/trees/single_thread_proxy.cc
+++ b/cc/trees/single_thread_proxy.cc
@@ -73,7 +73,7 @@
 }
 
 void SingleThreadProxy::Start() {
-  DebugScopedSetImplThread impl(task_runner_provider_);
+  DCHECK(task_runner_provider_->IsMainThread());
 
   const LayerTreeSettings& settings = layer_tree_host_->GetSettings();
   DCHECK(settings.single_thread_proxy_scheduler ||
@@ -81,6 +81,7 @@
       << "Checker-imaging is not supported in synchronous single threaded mode";
   {
     DebugScopedSetMainThreadBlocked main_thread_blocked(task_runner_provider_);
+    DebugScopedSetImplThread impl(task_runner_provider_);
     host_impl_ = layer_tree_host_->CreateLayerTreeHostImpl(this);
   }
   if (settings.single_thread_proxy_scheduler && !scheduler_on_impl_thread_) {
@@ -114,11 +115,10 @@
 }
 
 void SingleThreadProxy::SetVisible(bool visible) {
+  DCHECK(task_runner_provider_->IsMainThread());
   TRACE_EVENT1("cc", "SingleThreadProxy::SetVisible", "visible", visible);
   DebugScopedSetImplThread impl(task_runner_provider_);
-
   host_impl_->SetVisible(visible);
-
   if (scheduler_on_impl_thread_)
     scheduler_on_impl_thread_->SetVisible(host_impl_->visible());
 }
@@ -132,9 +132,18 @@
   layer_tree_host_->RequestNewLayerTreeFrameSink();
 }
 
+void SingleThreadProxy::DidObserveFirstScrollDelay(
+    base::TimeDelta first_scroll_delay,
+    base::TimeTicks first_scroll_timestamp) {
+  DCHECK(!task_runner_provider_->HasImplThread() ||
+         task_runner_provider_->IsImplThread());
+}
+
 void SingleThreadProxy::ReleaseLayerTreeFrameSink() {
+  DCHECK(task_runner_provider_->IsMainThread());
   layer_tree_frame_sink_lost_ = true;
   frame_sink_bound_weak_factory_.InvalidateWeakPtrs();
+  DebugScopedSetImplThread impl(task_runner_provider_);
   if (scheduler_on_impl_thread_)
     scheduler_on_impl_thread_->DidLoseLayerTreeFrameSink();
   return host_impl_->ReleaseLayerTreeFrameSink();
@@ -155,10 +164,12 @@
   if (success) {
     frame_sink_bound_weak_ptr_ = frame_sink_bound_weak_factory_.GetWeakPtr();
     layer_tree_host_->DidInitializeLayerTreeFrameSink();
-    if (scheduler_on_impl_thread_)
+    if (scheduler_on_impl_thread_) {
+      DebugScopedSetImplThread impl(task_runner_provider_);
       scheduler_on_impl_thread_->DidCreateAndInitializeLayerTreeFrameSink();
-    else if (!inside_synchronous_composite_)
+    } else if (!inside_synchronous_composite_) {
       SetNeedsCommit();
+    }
     layer_tree_frame_sink_creation_requested_ = false;
     layer_tree_frame_sink_lost_ = false;
   } else {
@@ -195,6 +206,8 @@
   TRACE_EVENT0("cc", "SingleThreadProxy::DoCommit");
   DCHECK(task_runner_provider_->IsMainThread());
 
+  IssueImageDecodeFinishedCallbacks();
+
   if (host_impl_->EvictedUIResourcesExist())
     layer_tree_host_->GetUIResourceManager()->RecreateUIResources();
 
@@ -205,10 +218,12 @@
   auto completion_event_ptr = std::make_unique<CompletionEvent>(
       base::WaitableEvent::ResetPolicy::MANUAL);
   auto* completion_event = completion_event_ptr.get();
+  // Must get unsafe_state before calling WillCommit() to avoid deadlock.
   auto& unsafe_state = layer_tree_host_->GetUnsafeStateForCommit();
   std::unique_ptr<CommitState> commit_state =
       layer_tree_host_->WillCommit(std::move(completion_event_ptr),
                                    /*has_updates=*/true);
+  DCHECK(commit_state.get());
   devtools_instrumentation::ScopedCommitTrace commit_task(
       layer_tree_host_->GetId(), commit_args.frame_id.sequence_number);
 
@@ -220,17 +235,24 @@
     host_impl_->BeginCommit(commit_state->source_frame_number);
 
     host_impl_->FinishCommit(*commit_state, unsafe_state);
+    commit_state.reset();
     completion_event->Signal();
 
-    if (scheduler_on_impl_thread_) {
+    if (scheduler_on_impl_thread_)
       scheduler_on_impl_thread_->DidCommit();
-    }
 
-    IssueImageDecodeFinishedCallbacks();
+    {
+      DebugScopedSetMainThread main(task_runner_provider_);
+      IssueImageDecodeFinishedCallbacks();
+    }
     host_impl_->CommitComplete();
 
-    layer_tree_host_->NotifyTransitionRequestsFinished(
-        host_impl_->TakeFinishedTransitionRequestSequenceIds());
+    std::vector<uint32_t> ids =
+        host_impl_->TakeFinishedTransitionRequestSequenceIds();
+    {
+      DebugScopedSetMainThread main(task_runner_provider_);
+      layer_tree_host_->NotifyTransitionRequestsFinished(ids);
+    }
 
     // Commit goes directly to the active tree, but we need to synchronously
     // "activate" the tree still during commit to satisfy any potential
@@ -242,7 +264,7 @@
 }
 
 void SingleThreadProxy::IssueImageDecodeFinishedCallbacks() {
-  DCHECK(task_runner_provider_->IsImplThread());
+  DCHECK(task_runner_provider_->IsMainThread());
 
   layer_tree_host_->ImageDecodesFinished(
       host_impl_->TakeCompletedImageDecodeRequests());
@@ -251,6 +273,7 @@
 void SingleThreadProxy::CommitComplete() {
   // Commit complete happens on the main side after activate to satisfy any
   // SetNextCommitWaitsForActivation calls.
+  DCHECK(task_runner_provider_->IsImplThread());
   DCHECK(!host_impl_->pending_tree())
       << "Activation is expected to have synchronously occurred by now.";
 
@@ -281,12 +304,15 @@
 
 void SingleThreadProxy::SetTargetLocalSurfaceId(
     const viz::LocalSurfaceId& target_local_surface_id) {
+  DCHECK(task_runner_provider_->IsMainThread());
   if (!scheduler_on_impl_thread_)
     return;
+  DebugScopedSetImplThread impl(task_runner_provider_);
   host_impl_->SetTargetLocalSurfaceId(target_local_surface_id);
 }
 
 bool SingleThreadProxy::RequestedAnimatePending() {
+  DCHECK(task_runner_provider_->IsMainThread());
   return animate_requested_ || update_layers_requested_ || commit_requested_ ||
          needs_impl_frame_;
 }
@@ -315,6 +341,7 @@
   layer_tree_host_->OnDeferMainFrameUpdatesChanged(defer_main_frame_update_);
 
   // The scheduler needs to know that it should not issue BeginMainFrame.
+  DebugScopedSetImplThread impl(task_runner_provider_);
   scheduler_on_impl_thread_->SetDeferBeginMainFrame(defer_main_frame_update_);
 }
 
@@ -340,6 +367,7 @@
 
 void SingleThreadProxy::StopDeferringCommits(
     PaintHoldingCommitTrigger trigger) {
+  DCHECK(task_runner_provider_->IsMainThread());
   if (!IsDeferringCommits())
     return;
   auto reason = *paint_holding_reason_;
@@ -398,33 +426,40 @@
 }
 
 void SingleThreadProxy::OnCanDrawStateChanged(bool can_draw) {
+  DCHECK(!task_runner_provider_->HasImplThread() ||
+         task_runner_provider_->IsImplThread());
   TRACE_EVENT1("cc", "SingleThreadProxy::OnCanDrawStateChanged", "can_draw",
                can_draw);
-  DCHECK(task_runner_provider_->IsImplThread());
   if (scheduler_on_impl_thread_)
     scheduler_on_impl_thread_->SetCanDraw(can_draw);
 }
 
 void SingleThreadProxy::NotifyReadyToActivate() {
+  DCHECK(!task_runner_provider_->HasImplThread() ||
+         task_runner_provider_->IsImplThread());
   TRACE_EVENT0("cc", "SingleThreadProxy::NotifyReadyToActivate");
-  DebugScopedSetImplThread impl(task_runner_provider_);
   if (scheduler_on_impl_thread_)
     scheduler_on_impl_thread_->NotifyReadyToActivate();
 }
 
 void SingleThreadProxy::NotifyReadyToDraw() {
+  DCHECK(!task_runner_provider_->HasImplThread() ||
+         task_runner_provider_->IsImplThread());
   TRACE_EVENT0("cc", "SingleThreadProxy::NotifyReadyToDraw");
-  DebugScopedSetImplThread impl(task_runner_provider_);
   if (scheduler_on_impl_thread_)
     scheduler_on_impl_thread_->NotifyReadyToDraw();
 }
 
 void SingleThreadProxy::SetNeedsRedrawOnImplThread() {
+  DCHECK(!task_runner_provider_->HasImplThread() ||
+         task_runner_provider_->IsImplThread());
   if (scheduler_on_impl_thread_)
     scheduler_on_impl_thread_->SetNeedsRedraw();
 }
 
 void SingleThreadProxy::SetNeedsOneBeginImplFrameOnImplThread() {
+  DCHECK(!task_runner_provider_->HasImplThread() ||
+         task_runner_provider_->IsImplThread());
   TRACE_EVENT0("cc",
                "SingleThreadProxy::SetNeedsOneBeginImplFrameOnImplThread");
   single_thread_client_->ScheduleAnimationForWebTests();
@@ -434,12 +469,16 @@
 }
 
 void SingleThreadProxy::SetNeedsPrepareTilesOnImplThread() {
+  DCHECK(!task_runner_provider_->HasImplThread() ||
+         task_runner_provider_->IsImplThread());
   TRACE_EVENT0("cc", "SingleThreadProxy::SetNeedsPrepareTilesOnImplThread");
   if (scheduler_on_impl_thread_)
     scheduler_on_impl_thread_->SetNeedsPrepareTiles();
 }
 
 void SingleThreadProxy::SetNeedsCommitOnImplThread() {
+  DCHECK(!task_runner_provider_->HasImplThread() ||
+         task_runner_provider_->IsImplThread());
   single_thread_client_->ScheduleAnimationForWebTests();
   if (scheduler_on_impl_thread_)
     scheduler_on_impl_thread_->SetNeedsBeginMainFrame();
@@ -447,6 +486,8 @@
 }
 
 void SingleThreadProxy::SetVideoNeedsBeginFrames(bool needs_begin_frames) {
+  DCHECK(!task_runner_provider_->HasImplThread() ||
+         task_runner_provider_->IsImplThread());
   TRACE_EVENT1("cc", "SingleThreadProxy::SetVideoNeedsBeginFrames",
                "needs_begin_frames", needs_begin_frames);
   // In tests the layer tree is destroyed after the scheduler is.
@@ -455,38 +496,66 @@
 }
 
 bool SingleThreadProxy::HasInvalidationAnimation() const {
+  // DebugScopedSetImplThread here is just a formality; all SchedulerClient
+  // methods should have it.
+  DebugScopedSetImplThread impl(task_runner_provider_);
   return false;
 }
 
 bool SingleThreadProxy::IsInsideDraw() {
+  DCHECK(!task_runner_provider_->HasImplThread() ||
+         task_runner_provider_->IsImplThread());
   return inside_draw_;
 }
 
 bool SingleThreadProxy::IsBeginMainFrameExpected() {
+  DCHECK(!task_runner_provider_->HasImplThread() ||
+         task_runner_provider_->IsImplThread());
   return true;
 }
 
+void SingleThreadProxy::RenewTreePriority() {
+  DCHECK(!task_runner_provider_->HasImplThread() ||
+         task_runner_provider_->IsImplThread());
+}
+
+void SingleThreadProxy::PostDelayedAnimationTaskOnImplThread(
+    base::OnceClosure task,
+    base::TimeDelta delay) {
+  DCHECK(!task_runner_provider_->HasImplThread() ||
+         task_runner_provider_->IsImplThread());
+}
+
 void SingleThreadProxy::DidActivateSyncTree() {
+  DCHECK(!task_runner_provider_->HasImplThread() ||
+         task_runner_provider_->IsImplThread());
   CommitComplete();
 }
 
 void SingleThreadProxy::WillPrepareTiles() {
-  DCHECK(task_runner_provider_->IsImplThread());
+  DCHECK(!task_runner_provider_->HasImplThread() ||
+         task_runner_provider_->IsImplThread());
   if (scheduler_on_impl_thread_)
     scheduler_on_impl_thread_->WillPrepareTiles();
 }
 
 void SingleThreadProxy::DidPrepareTiles() {
-  DCHECK(task_runner_provider_->IsImplThread());
+  DCHECK(!task_runner_provider_->HasImplThread() ||
+         task_runner_provider_->IsImplThread());
   if (scheduler_on_impl_thread_)
     scheduler_on_impl_thread_->DidPrepareTiles();
 }
 
 void SingleThreadProxy::DidCompletePageScaleAnimationOnImplThread() {
+  DCHECK(!task_runner_provider_->HasImplThread() ||
+         task_runner_provider_->IsImplThread());
+  DebugScopedSetMainThread main(task_runner_provider_);
   layer_tree_host_->DidCompletePageScaleAnimation();
 }
 
 void SingleThreadProxy::DidLoseLayerTreeFrameSinkOnImplThread() {
+  DCHECK(!task_runner_provider_->HasImplThread() ||
+         task_runner_provider_->IsImplThread());
   TRACE_EVENT0("cc",
                "SingleThreadProxy::DidLoseLayerTreeFrameSinkOnImplThread");
   {
@@ -494,24 +563,33 @@
     // This must happen before we notify the scheduler as it may try to recreate
     // the output surface if already in BEGIN_IMPL_FRAME_STATE_IDLE.
     layer_tree_host_->DidLoseLayerTreeFrameSink();
+    single_thread_client_->DidLoseLayerTreeFrameSink();
   }
-  single_thread_client_->DidLoseLayerTreeFrameSink();
   if (scheduler_on_impl_thread_)
     scheduler_on_impl_thread_->DidLoseLayerTreeFrameSink();
   layer_tree_frame_sink_lost_ = true;
 }
 
 void SingleThreadProxy::SetBeginFrameSource(viz::BeginFrameSource* source) {
+  DCHECK(!task_runner_provider_->HasImplThread() ||
+         task_runner_provider_->IsImplThread());
   if (scheduler_on_impl_thread_)
     scheduler_on_impl_thread_->SetBeginFrameSource(source);
 }
 
 void SingleThreadProxy::DidReceiveCompositorFrameAckOnImplThread() {
+  DCHECK(!task_runner_provider_->HasImplThread() ||
+         task_runner_provider_->IsImplThread());
   TRACE_EVENT0("cc,benchmark",
                "SingleThreadProxy::DidReceiveCompositorFrameAckOnImplThread");
   if (scheduler_on_impl_thread_)
     scheduler_on_impl_thread_->DidReceiveCompositorFrameAck();
-  if (layer_tree_host_->GetSettings().send_compositor_frame_ack) {
+  bool send_ack;
+  {
+    DebugScopedSetMainThread main(task_runner_provider_);
+    send_ack = layer_tree_host_->GetSettings().send_compositor_frame_ack;
+  }
+  if (send_ack) {
     // We do a PostTask here because freeing resources in some cases (such as in
     // TextureLayer) is PostTasked and we want to make sure ack is received
     // after resources are returned.
@@ -530,6 +608,8 @@
 
 void SingleThreadProxy::NeedsImplSideInvalidation(
     bool needs_first_draw_on_activation) {
+  DCHECK(!task_runner_provider_->HasImplThread() ||
+         task_runner_provider_->IsImplThread());
   if (scheduler_on_impl_thread_) {
     scheduler_on_impl_thread_->SetNeedsImplSideInvalidation(
         needs_first_draw_on_activation);
@@ -537,26 +617,26 @@
 }
 
 void SingleThreadProxy::NotifyImageDecodeRequestFinished() {
+  DCHECK(!task_runner_provider_->HasImplThread() ||
+         task_runner_provider_->IsImplThread());
   // If we don't have a scheduler, then just issue the callbacks here.
   // Otherwise, schedule a commit.
   if (!scheduler_on_impl_thread_) {
-    DebugScopedSetMainThreadBlocked main_thread_blocked(task_runner_provider_);
-    DebugScopedSetImplThread impl(task_runner_provider_);
-
+    auto sequence_ids = host_impl_->TakeFinishedTransitionRequestSequenceIds();
+    DebugScopedSetMainThread main_thread(task_runner_provider_);
     IssueImageDecodeFinishedCallbacks();
-
-    layer_tree_host_->NotifyTransitionRequestsFinished(
-        host_impl_->TakeFinishedTransitionRequestSequenceIds());
-    return;
+    layer_tree_host_->NotifyTransitionRequestsFinished(sequence_ids);
+  } else {
+    SetNeedsCommitOnImplThread();
   }
-  SetNeedsCommitOnImplThread();
 }
 
 void SingleThreadProxy::DidPresentCompositorFrameOnImplThread(
     uint32_t frame_token,
     PresentationTimeCallbackBuffer::PendingCallbacks callbacks,
     const viz::FrameTimingDetails& details) {
-  DebugScopedSetImplThread impl(task_runner_provider_);
+  DCHECK(!task_runner_provider_->HasImplThread() ||
+         task_runner_provider_->IsImplThread());
   host_impl_->NotifyDidPresentCompositorFrameOnImplThread(
       frame_token, std::move(callbacks.compositor_thread_callbacks), details);
   {
@@ -573,6 +653,9 @@
 void SingleThreadProxy::NotifyAnimationWorkletStateChange(
     AnimationWorkletMutationState state,
     ElementListType element_list_type) {
+  DCHECK(!task_runner_provider_->HasImplThread() ||
+         task_runner_provider_->IsImplThread());
+  DebugScopedSetMainThread main(task_runner_provider_);
   layer_tree_host_->NotifyAnimationWorkletStateChange(state, element_list_type);
 }
 
@@ -584,6 +667,8 @@
 
 void SingleThreadProxy::NotifyThroughputTrackerResults(
     CustomTrackerResults results) {
+  DCHECK(!task_runner_provider_->HasImplThread() ||
+         task_runner_provider_->IsImplThread());
   // This method is called from ImplThread side to report after being requested,
   // or from the MainThread when releasing FrameSequenceTrackers during
   // destruction. Regardless, `layer_tree_host_` should be accessed from
@@ -593,17 +678,22 @@
 }
 
 bool SingleThreadProxy::IsInSynchronousComposite() const {
+  DCHECK(!task_runner_provider_->HasImplThread() ||
+         task_runner_provider_->IsImplThread());
   return inside_synchronous_composite_;
 }
 
 void SingleThreadProxy::FrameSinksToThrottleUpdated(
     const base::flat_set<viz::FrameSinkId>& ids) {
-  DebugScopedSetMainThread main(task_runner_provider_);
+  DCHECK(!task_runner_provider_->HasImplThread() ||
+         task_runner_provider_->IsImplThread());
   single_thread_client_->FrameSinksToThrottleUpdated(ids);
 }
 
 void SingleThreadProxy::RequestBeginMainFrameNotExpected(bool new_state) {
+  DCHECK(task_runner_provider_->IsMainThread());
   if (scheduler_on_impl_thread_) {
+    DebugScopedSetImplThread impl(task_runner_provider_);
     scheduler_on_impl_thread_->SetMainThreadWantsBeginMainFrameNotExpected(
         new_state);
   }
@@ -763,11 +853,25 @@
 }
 
 bool SingleThreadProxy::MainFrameWillHappenForTesting() {
+  DCHECK(task_runner_provider_->IsMainThread());
   if (!scheduler_on_impl_thread_)
     return false;
+  DebugScopedSetImplThread impl(task_runner_provider_);
   return scheduler_on_impl_thread_->MainFrameForTestingWillHappen();
 }
 
+void SingleThreadProxy::SetSourceURL(ukm::SourceId source_id, const GURL& url) {
+  DCHECK(task_runner_provider_->IsMainThread());
+  // Single-threaded mode is only for browser compositing and for renderers in
+  // layout tests. This will still get called in the latter case, but we don't
+  // need to record UKM in that case.
+}
+
+void SingleThreadProxy::SetUkmSmoothnessDestination(
+    base::WritableSharedMemoryMapping ukm_smoothness_data) {
+  DCHECK(task_runner_provider_->IsMainThread());
+}
+
 void SingleThreadProxy::ClearHistory() {
   DCHECK(task_runner_provider_->IsImplThread());
   if (scheduler_on_impl_thread_)
@@ -782,9 +886,16 @@
 
 void SingleThreadProxy::SetRenderFrameObserver(
     std::unique_ptr<RenderFrameMetadataObserver> observer) {
+  DCHECK(task_runner_provider_->IsMainThread());
+  DebugScopedSetImplThread impl(task_runner_provider_);
   host_impl_->SetRenderFrameObserver(std::move(observer));
 }
 
+void SingleThreadProxy::SetEnableFrameRateThrottling(
+    bool enable_frame_rate_throttling) {
+  DCHECK(task_runner_provider_->IsMainThread());
+}
+
 uint32_t SingleThreadProxy::GetAverageThroughput() const {
   DebugScopedSetImplThread impl(task_runner_provider_);
   return host_impl_->dropped_frame_counter()->GetAverageThroughput();
@@ -794,6 +905,8 @@
     BrowserControlsState constraints,
     BrowserControlsState current,
     bool animate) {
+  DCHECK(task_runner_provider_->IsMainThread());
+  DebugScopedSetImplThread impl(task_runner_provider_);
   host_impl_->browser_controls_manager()->UpdateBrowserControlsState(
       constraints, current, animate);
 }
@@ -810,6 +923,7 @@
 
 void SingleThreadProxy::ScheduledActionSendBeginMainFrame(
     const viz::BeginFrameArgs& begin_frame_args) {
+  DebugScopedSetImplThread impl(task_runner_provider_);
   TRACE_EVENT0("cc", "SingleThreadProxy::ScheduledActionSendBeginMainFrame");
 #if DCHECK_IS_ON()
   // Although this proxy is single-threaded, it's problematic to synchronously
@@ -831,16 +945,24 @@
 }
 
 void SingleThreadProxy::FrameIntervalUpdated(base::TimeDelta interval) {
-  DebugScopedSetMainThread main(task_runner_provider_);
+  DebugScopedSetImplThread impl(task_runner_provider_);
   single_thread_client_->FrameIntervalUpdated(interval);
 }
 
 void SingleThreadProxy::SendBeginMainFrameNotExpectedSoon() {
+  // DebugScopedSetImplThread here is just a formality; all SchedulerClient
+  // methods should have it.
+  DebugScopedSetImplThread impl(task_runner_provider_);
+  DebugScopedSetMainThread main(task_runner_provider_);
   layer_tree_host_->BeginMainFrameNotExpectedSoon();
 }
 
 void SingleThreadProxy::ScheduledActionBeginMainFrameNotExpectedUntil(
     base::TimeTicks time) {
+  // DebugScopedSetImplThread here is just a formality; all SchedulerClient
+  // methods should have it.
+  DebugScopedSetImplThread impl(task_runner_provider_);
+  DebugScopedSetMainThread main(task_runner_provider_);
   layer_tree_host_->BeginMainFrameNotExpectedUntil(time);
 }
 
@@ -984,6 +1106,9 @@
 }
 
 void SingleThreadProxy::ScheduledActionCommit() {
+  // DebugScopedSetImplThread here is just a formality; all SchedulerClient
+  // methods should have it.
+  DebugScopedSetImplThread impl(task_runner_provider_);
   DebugScopedSetMainThread main(task_runner_provider_);
   DoCommit(scheduler_on_impl_thread_->last_dispatched_begin_main_frame_args());
 }
@@ -994,8 +1119,8 @@
 }
 
 void SingleThreadProxy::ScheduledActionBeginLayerTreeFrameSinkCreation() {
-  DebugScopedSetMainThread main(task_runner_provider_);
   DCHECK(scheduler_on_impl_thread_);
+  DebugScopedSetImplThread impl(task_runner_provider_);
   // If possible, create the output surface in a post task.  Synchronously
   // creating the output surface makes tests more awkward since this differs
   // from the ThreadProxy behavior.  However, sometimes there is no
@@ -1003,6 +1128,7 @@
   if (task_runner_provider_->MainThreadTaskRunner()) {
     ScheduleRequestNewLayerTreeFrameSink();
   } else {
+    DebugScopedSetMainThread main(task_runner_provider_);
     RequestNewLayerTreeFrameSink();
   }
 }
@@ -1022,8 +1148,8 @@
 
 void SingleThreadProxy::ScheduledActionPerformImplSideInvalidation() {
   DCHECK(scheduler_on_impl_thread_);
-
   DebugScopedSetImplThread impl(task_runner_provider_);
+
   host_impl_->InvalidateContentOnImplSide();
 
   // Invalidations go directly to the active tree, so we synchronously call
@@ -1052,10 +1178,12 @@
 }
 
 void SingleThreadProxy::WillNotReceiveBeginFrame() {
+  DebugScopedSetImplThread impl(task_runner_provider_);
   host_impl_->DidNotNeedBeginFrame();
 }
 
 void SingleThreadProxy::DidReceiveCompositorFrameAck() {
+  DebugScopedSetMainThread main(task_runner_provider_);
   layer_tree_host_->DidReceiveCompositorFrameAck();
 }
 

cc/trees/single_thread_proxy.h

diff --git a/cc/trees/single_thread_proxy.h b/cc/trees/single_thread_proxy.h
index 445b3596..f890dce 100644
--- a/cc/trees/single_thread_proxy.h
+++ b/cc/trees/single_thread_proxy.h
@@ -70,17 +70,13 @@
   void SetPaintWorkletLayerPainter(
       std::unique_ptr<PaintWorkletLayerPainter> painter) override;
   bool MainFrameWillHappenForTesting() override;
-  void SetSourceURL(ukm::SourceId source_id, const GURL& url) override {
-    // Single-threaded mode is only for browser compositing and for renderers in
-    // layout tests. This will still get called in the latter case, but we don't
-    // need to record UKM in that case.
-  }
+  void RequestBeginMainFrameNotExpected(bool new_state) override;
+  void SetSourceURL(ukm::SourceId source_id, const GURL& url) override;
   void SetUkmSmoothnessDestination(
-      base::WritableSharedMemoryMapping ukm_smoothness_data) override {}
+      base::WritableSharedMemoryMapping ukm_smoothness_data) override;
   void SetRenderFrameObserver(
       std::unique_ptr<RenderFrameMetadataObserver> observer) override;
-  void SetEnableFrameRateThrottling(
-      bool enable_frame_rate_throttling) override {}
+  void SetEnableFrameRateThrottling(bool enable_frame_rate_throttling) override;
   uint32_t GetAverageThroughput() const override;
 
   void UpdateBrowserControlsState(BrowserControlsState constraints,
@@ -124,9 +120,9 @@
   void SetVideoNeedsBeginFrames(bool needs_begin_frames) override;
   bool IsInsideDraw() override;
   bool IsBeginMainFrameExpected() override;
-  void RenewTreePriority() override {}
+  void RenewTreePriority() override;
   void PostDelayedAnimationTaskOnImplThread(base::OnceClosure task,
-                                            base::TimeDelta delay) override {}
+                                            base::TimeDelta delay) override;
   void DidActivateSyncTree() override;
   void WillPrepareTiles() override;
   void DidPrepareTiles() override;
@@ -134,7 +130,6 @@
   void OnDrawForLayerTreeFrameSink(bool resourceless_software_draw,
                                    bool skip_draw) override;
   void NeedsImplSideInvalidation(bool needs_first_draw_on_activation) override;
-  void RequestBeginMainFrameNotExpected(bool new_state) override;
   void NotifyImageDecodeRequestFinished() override;
   void DidPresentCompositorFrameOnImplThread(
       uint32_t frame_token,
@@ -156,11 +151,7 @@
 
   void DidObserveFirstScrollDelay(
       base::TimeDelta first_scroll_delay,
-      base::TimeTicks first_scroll_timestamp) override {
-    // Single-threaded mode is only for browser compositing and for renderers in
-    // layout tests. This will still get called in the latter case, but we don't
-    // need to record UKM in that case.
-  }
+      base::TimeTicks first_scroll_timestamp) override;
 
   // Called by the legacy path where RenderWidget does the scheduling.
   // Rasterization of tiles is only performed when |raster| is true.
@@ -251,7 +242,10 @@
   explicit DebugScopedSetImplThread(TaskRunnerProvider* task_runner_provider)
       : task_runner_provider_(task_runner_provider) {
     previous_value_ = task_runner_provider_->impl_thread_is_overridden_;
-    task_runner_provider_->SetCurrentThreadIsImplThread(true);
+    // Some test code will used this in both single- and multi-threaded mode;
+    // we should just ignore it in multi-threaded mode.
+    if (!task_runner_provider_->HasImplThread())
+      task_runner_provider_->SetCurrentThreadIsImplThread(true);
   }
 #else
   explicit DebugScopedSetImplThread(TaskRunnerProvider* task_runner_provider) {}
@@ -261,7 +255,8 @@
 
   ~DebugScopedSetImplThread() {
 #if DCHECK_IS_ON()
-    task_runner_provider_->SetCurrentThreadIsImplThread(previous_value_);
+    if (!task_runner_provider_->HasImplThread())
+      task_runner_provider_->SetCurrentThreadIsImplThread(previous_value_);
 #endif
   }
 
@@ -283,7 +278,8 @@
   explicit DebugScopedSetMainThread(TaskRunnerProvider* task_runner_provider)
       : task_runner_provider_(task_runner_provider) {
     previous_value_ = task_runner_provider_->impl_thread_is_overridden_;
-    task_runner_provider_->SetCurrentThreadIsImplThread(false);
+    if (!task_runner_provider_->HasImplThread())
+      task_runner_provider_->SetCurrentThreadIsImplThread(false);
   }
 #else
   explicit DebugScopedSetMainThread(TaskRunnerProvider* task_runner_provider) {}
@@ -293,7 +289,8 @@
 
   ~DebugScopedSetMainThread() {
 #if DCHECK_IS_ON()
-    task_runner_provider_->SetCurrentThreadIsImplThread(previous_value_);
+    if (!task_runner_provider_->HasImplThread())
+      task_runner_provider_->SetCurrentThreadIsImplThread(previous_value_);
 #endif
   }
 

chrome/android/java/res/values/colors.xml

diff --git a/chrome/android/java/res/values/colors.xml b/chrome/android/java/res/values/colors.xml
index 43825c03..eb4ccf60 100644
--- a/chrome/android/java/res/values/colors.xml
+++ b/chrome/android/java/res/values/colors.xml
@@ -67,7 +67,6 @@
     <color name="bookmark_widget_background">@color/default_bg_color_baseline</color>
 
     <!-- History Navigation UI colors -->
-    <color name="navigation_bubble_background_color">@color/default_bg_color_elev_2</color>
     <color name="navigation_bubble_arrow">@android:color/black</color>
 
     <!-- Scrollbar colors -->
@@ -81,7 +80,7 @@
     <color name="offline_indicator_back_online_color">@color/default_bg_color_blue</color>
 
     <!-- Material colorSurface  See See https://crbug.com/1186712 -->
-    <color name="material_color_surface">@color/default_bg_color_elev_4</color>
+    <color name="material_color_surface">@color/default_bg_color_elev_4_baseline</color>
 
     <!-- Other colors -->
     <color name="media_viewer_bg">#000000</color>

chrome/android/java/src/org/chromium/chrome/browser/SwipeRefreshHandler.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/SwipeRefreshHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/SwipeRefreshHandler.java
index 7f2a3cf..9fa25fcb 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/SwipeRefreshHandler.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/SwipeRefreshHandler.java
@@ -20,6 +20,7 @@
 import org.chromium.chrome.browser.tab.EmptyTabObserver;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabWebContentsUserData;
+import org.chromium.components.browser_ui.styles.ChromeColors;
 import org.chromium.components.browser_ui.styles.SemanticColorUtils;
 import org.chromium.content_public.browser.UiThreadTaskTraits;
 import org.chromium.content_public.browser.WebContents;
@@ -116,8 +117,8 @@
         mSwipeRefreshLayout = new SwipeRefreshLayout(context);
         mSwipeRefreshLayout.setLayoutParams(
                 new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
-        mSwipeRefreshLayout.setProgressBackgroundColorSchemeResource(
-                R.color.default_bg_color_elev_2);
+        mSwipeRefreshLayout.setProgressBackgroundColorSchemeColor(
+                ChromeColors.getSurfaceColor(context, R.dimen.default_elevation_2));
         mSwipeRefreshLayout.setColorSchemeColors(
                 SemanticColorUtils.getDefaultControlColorActive(context));
         if (mContainerView != null) mSwipeRefreshLayout.setEnabled(true);

chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowCoordinator.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowCoordinator.java
index 0e75f57a..9924fe0 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowCoordinator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowCoordinator.java
@@ -18,11 +18,16 @@
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.base.task.PostTask;
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.commerce.shopping_list.ShoppingFeatures;
 import org.chromium.chrome.browser.power_bookmarks.PowerBookmarkMeta;
 import org.chromium.chrome.browser.subscriptions.SubscriptionsManager;
+import org.chromium.chrome.browser.user_education.IPHCommandBuilder;
+import org.chromium.chrome.browser.user_education.UserEducationHelper;
 import org.chromium.components.bookmarks.BookmarkId;
 import org.chromium.components.browser_ui.bottomsheet.BottomSheetContent;
 import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
+import org.chromium.components.browser_ui.bottomsheet.EmptyBottomSheetObserver;
+import org.chromium.components.feature_engagement.FeatureConstants;
 import org.chromium.content_public.browser.UiThreadTaskTraits;
 import org.chromium.ui.modelutil.PropertyKey;
 import org.chromium.ui.modelutil.PropertyModel;
@@ -48,17 +53,22 @@
 
     private boolean mClosedViaRunnable;
 
+    private UserEducationHelper mUserEducationHelper;
+
     /**
      * @param context The {@link Context} associated with this cooridnator.
      * @param bottomSheetController Allows displaying content in the bottom sheet.
      * @param subscriptionsManager Allows un/subscribing for product updates, used for
      *         price-tracking.
+     * @param userEducationHelper A means of triggering IPH.
      */
     public BookmarkSaveFlowCoordinator(@NonNull Context context,
             @NonNull BottomSheetController bottomSheetController,
-            @NonNull SubscriptionsManager subscriptionsManager) {
+            @NonNull SubscriptionsManager subscriptionsManager,
+            @NonNull UserEducationHelper userEducationHelper) {
         mContext = context;
         mBottomSheetController = bottomSheetController;
+        mUserEducationHelper = userEducationHelper;
         mBookmarkModel = new BookmarkModel();
         mDestroyChecker = new DestroyChecker();
 
@@ -98,7 +108,8 @@
             @Nullable PowerBookmarkMeta meta) {
         mDestroyChecker.checkNotDestroyed();
         mBottomSheetContent = new BookmarkSaveFlowBottomSheetContent(mBookmarkSaveFlowView);
-        mBottomSheetController.requestShowContent(mBottomSheetContent, /* animate= */ true);
+        boolean shown =
+                mBottomSheetController.requestShowContent(mBottomSheetContent, /* animate= */ true);
         mMediator.show(bookmarkId, meta, fromExplicitTrackUi, wasBookmarkMoved);
 
         AccessibilityManager am =
@@ -106,6 +117,36 @@
         if (!am.isTouchExplorationEnabled()) {
             setupAutodismiss();
         }
+
+        if (ShoppingFeatures.isShoppingListEnabled()
+                && PowerBookmarkUtils.isBookmarkPriceTracked(mBookmarkModel, bookmarkId)) {
+            if (shown) {
+                showShoppingSaveFlowIPH();
+            } else {
+                mBottomSheetController.addObserver(new EmptyBottomSheetObserver() {
+                    @Override
+                    public void onSheetContentChanged(BottomSheetContent newContent) {
+                        if (newContent == mBottomSheetContent) showShoppingSaveFlowIPH();
+
+                        mBottomSheetController.removeObserver(this);
+                    }
+                });
+            }
+        }
+    }
+
+    /**
+     * Show the IPH for the save flow that tells a user that they can organize their products from
+     * the bookmarks surface.
+     */
+    private void showShoppingSaveFlowIPH() {
+        mUserEducationHelper.requestShowIPH(
+                new IPHCommandBuilder(mBookmarkSaveFlowView.getResources(),
+                        FeatureConstants.SHOPPING_LIST_SAVE_FLOW_FEATURE,
+                        R.string.iph_shopping_list_save_flow, R.string.iph_shopping_list_save_flow)
+                        .setAnchorView(
+                                mBookmarkSaveFlowView.findViewById(R.id.bookmark_select_folder))
+                        .build());
     }
 
     private void close() {

chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowMediator.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowMediator.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowMediator.java
index e38041f1..cb7d950 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowMediator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowMediator.java
@@ -16,11 +16,14 @@
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkItem;
 import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkModelObserver;
+import org.chromium.chrome.browser.feature_engagement.TrackerFactory;
 import org.chromium.chrome.browser.power_bookmarks.PowerBookmarkMeta;
 import org.chromium.chrome.browser.power_bookmarks.PowerBookmarkType;
+import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.subscriptions.CommerceSubscription;
 import org.chromium.chrome.browser.subscriptions.SubscriptionsManager;
 import org.chromium.components.bookmarks.BookmarkId;
+import org.chromium.components.feature_engagement.EventConstants;
 import org.chromium.ui.modelutil.PropertyModel;
 
 /** Controls the bookmarks save-flow. */
@@ -86,6 +89,8 @@
         mPropertyModel.set(BookmarkSaveFlowProperties.FOLDER_SELECT_ONCLICK_LISTENER, (v) -> {
             RecordUserAction.record("MobileBookmark.SaveFlow.EditFolder");
             BookmarkUtils.startFolderSelectActivity(mContext, mBookmarkId);
+            TrackerFactory.getTrackerForProfile(Profile.getLastUsedRegularProfile())
+                    .notifyEvent(EventConstants.SHOPPING_LIST_SAVE_FLOW_FOLDER_TAP);
             mCloseRunnable.run();
         });
 

chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java
index 1638ad0..b02b704d 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java
@@ -10,6 +10,7 @@
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
+import android.os.Handler;
 import android.provider.Browser;
 import android.text.TextUtils;
 import android.text.format.DateUtils;
@@ -51,6 +52,7 @@
 import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar;
 import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
 import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarController;
+import org.chromium.chrome.browser.user_education.UserEducationHelper;
 import org.chromium.components.bookmarks.BookmarkId;
 import org.chromium.components.bookmarks.BookmarkType;
 import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
@@ -165,7 +167,8 @@
                 new BookmarkSaveFlowCoordinator(activity, bottomSheetController,
                         new CommerceSubscriptionsServiceFactory()
                                 .getForLastUsedProfile()
-                                .getSubscriptionsManager());
+                                .getSubscriptionsManager(),
+                        new UserEducationHelper(activity, new Handler()));
         bookmarkSaveFlowCoordinator.show(bookmarkId, fromExplicitTrackUi, wasBookmarkMoved);
     }
 

chrome/android/java/src/org/chromium/chrome/browser/bookmarks/PowerBookmarkUtils.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/PowerBookmarkUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/PowerBookmarkUtils.java
index aad5abc..0c0b3f6 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/PowerBookmarkUtils.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/PowerBookmarkUtils.java
@@ -169,4 +169,12 @@
     public static void setPriceTrackingEligibleForTesting(@Nullable Boolean enabled) {
         sPriceTrackingEligibleForTesting = enabled;
     }
+
+    /** @return Whether the price tracking flag is set in the bookmark's meta. */
+    public static boolean isBookmarkPriceTracked(BookmarkModel model, BookmarkId id) {
+        PowerBookmarkMeta meta = model.getPowerBookmarkMeta(id);
+        if (meta == null || meta.getType() != PowerBookmarkType.SHOPPING) return false;
+
+        return meta.getShoppingSpecifics().getIsPriceTracked();
+    }
 }
\ No newline at end of file

chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabToolbar.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabToolbar.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabToolbar.java
index cee80e7..4ef5eee 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabToolbar.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabToolbar.java
@@ -85,6 +85,9 @@
 import org.chromium.ui.widget.Toast;
 import org.chromium.url.GURL;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * The Toolbar layout to be used for a custom tab. This is used for both phone and tablet UIs.
  */
@@ -360,6 +363,7 @@
     public void setHandleStrategy(HandleStrategy strategy) {
         mHandleStrategy = strategy;
         mHandleStrategy.setCloseClickHandler(mCloseButton::callOnClick);
+        mLocationBar.showBranding();
     }
 
     private void updateButtonsTint() {
@@ -630,6 +634,7 @@
                                                   LocationBarDataProvider.Observer,
                                                   View.OnLongClickListener {
         private static final int TITLE_ANIM_DELAY_MS = 800;
+        private static final int BRANDING_DELAY_MS = 1800;
 
         private static final int STATE_DOMAIN_ONLY = 0;
         private static final int STATE_TITLE_ONLY = 1;
@@ -654,6 +659,9 @@
             }
         };
 
+        private boolean mCurrentlyShowingBranding;
+        private List<Runnable> mAfterBrandingRunnables;
+
         public View getLayout() {
             return mLocationBarFrameLayout;
         }
@@ -666,6 +674,31 @@
             return mState == STATE_TITLE_ONLY;
         }
 
+        public void showBranding() {
+            mCurrentlyShowingBranding = true;
+            mAfterBrandingRunnables = new ArrayList<>();
+
+            // Store the title and domain setting.
+            final boolean showTitle = mState != STATE_DOMAIN_ONLY;
+            final boolean showUrlBar = mState != STATE_TITLE_ONLY;
+
+            // We use title bar to show the branding text and hide the url bar so the text will
+            // align with the security icon.
+            setShowTitle(true);
+            setUrlBarHidden(true);
+            showBrandingIconAndText();
+
+            PostTask.postDelayedTask(UiThreadTaskTraits.DEFAULT, () -> {
+                mCurrentlyShowingBranding = false;
+                setUrlBarHidden(!showUrlBar);
+                setShowTitle(showTitle);
+                for (Runnable runnable : mAfterBrandingRunnables) {
+                    runnable.run();
+                }
+                mAfterBrandingRunnables.clear();
+            }, BRANDING_DELAY_MS);
+        }
+
         public void onFinishInflate(View container) {
             mUrlBar = (TextView) container.findViewById(R.id.url_bar);
             mUrlBar.setHint("");
@@ -740,6 +773,7 @@
                 if (webContents == null) return;
                 Activity activity = currentTab.getWindowAndroid().getActivity().get();
                 if (activity == null) return;
+                if (mCurrentlyShowingBranding) return;
                 // For now we don't show "store info" row for custom tab.
                 new ChromePageInfo(mModalDialogManagerSupplier, getContentPublisher(),
                         OpenedFromSource.TOOLBAR, /*storeInfoActionHandlerSupplier=*/null)
@@ -822,8 +856,22 @@
             }
         }
 
+        private void showBrandingIconAndText() {
+            ColorStateList colorStateList = AppCompatResources.getColorStateList(
+                    getContext(), mLocationBarDataProvider.getSecurityIconColorStateList());
+            ApiCompatibilityUtils.setImageTintList(mSecurityButton, colorStateList);
+            mAnimDelegate.updateSecurityButton(R.drawable.chromelogo16);
+
+            mTitleBar.setText(R.string.twa_running_in_chrome);
+            mTitleAnimationStarter.run();
+        }
+
         private void updateSecurityIcon() {
             if (mState == STATE_TITLE_ONLY) return;
+            if (mCurrentlyShowingBranding) {
+                mAfterBrandingRunnables.add(this::updateSecurityIcon);
+                return;
+            }
 
             int securityIconResource = mLocationBarDataProvider.getSecurityIconResource(
                     DeviceFormFactor.isNonMultiDisplayContextOnTablet(getContext()));
@@ -841,6 +889,10 @@
         }
 
         private void updateTitleBar() {
+            if (mCurrentlyShowingBranding) {
+                mAfterBrandingRunnables.add(this::updateTitleBar);
+                return;
+            }
             String title = mLocationBarDataProvider.getTitle();
             if (!mLocationBarDataProvider.hasTab() || TextUtils.isEmpty(title)) {
                 mTitleBar.setText("");
@@ -854,14 +906,21 @@
                     && !title.equals(mLocationBarDataProvider.getCurrentUrl())
                     && !title.equals(ContentUrlConstants.ABOUT_BLANK_DISPLAY_URL)) {
                 // Delay the title animation until security icon animation finishes.
-                PostTask.postDelayedTask(
-                        UiThreadTaskTraits.DEFAULT, mTitleAnimationStarter, TITLE_ANIM_DELAY_MS);
+                // If this is updated after branding, we don't need to wait.
+                PostTask.postDelayedTask(UiThreadTaskTraits.DEFAULT, mTitleAnimationStarter,
+                        mAfterBrandingRunnables != null && mAfterBrandingRunnables.size() > 0
+                                ? 0
+                                : TITLE_ANIM_DELAY_MS);
             }
 
             mTitleBar.setText(title);
         }
 
         private void updateUrlBar() {
+            if (mCurrentlyShowingBranding) {
+                mAfterBrandingRunnables.add(this::updateUrlBar);
+                return;
+            }
             Tab tab = getCurrentTab();
             if (tab == null) {
                 mUrlCoordinator.setUrlBarData(
@@ -936,6 +995,7 @@
                 mAnimDelegate.prepareTitleAnim(mUrlBar, mTitleBar);
             } else {
                 mState = STATE_DOMAIN_ONLY;
+                mTitleBar.setVisibility(View.GONE);
             }
             mLocationBarModel.notifyTitleChanged();
         }

chrome/android/java/src/org/chromium/chrome/browser/gesturenav/NavigationBubble.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/gesturenav/NavigationBubble.java b/chrome/android/java/src/org/chromium/chrome/browser/gesturenav/NavigationBubble.java
index 5b8193c5..9c95c84 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/gesturenav/NavigationBubble.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/gesturenav/NavigationBubble.java
@@ -100,9 +100,8 @@
         mColorUpdateListener = new ColorUpdateListener();
         mColorAnimator = ValueAnimator.ofFloat(0, 1).setDuration(COLOR_TRANSITION_DURATION_MS);
         mColorAnimator.addUpdateListener(mColorUpdateListener);
-        getBackground().setColorFilter(ApiCompatibilityUtils.getColor(getResources(),
-                                               R.color.navigation_bubble_background_color),
-                Mode.MULTIPLY);
+        getBackground().setColorFilter(
+                SemanticColorUtils.getNavigationBubbleBackgroundColor(context), Mode.MULTIPLY);
         mCloseApp = getResources().getString(R.string.overscroll_navigation_close_chrome,
                 getContext().getString(R.string.app_name));
         mCloseTab = getResources().getString(R.string.overscroll_navigation_close_tab);

chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowTest.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowTest.java
index 9fb3e1f..80753a32 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowTest.java
@@ -40,6 +40,7 @@
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.subscriptions.CommerceSubscription;
 import org.chromium.chrome.browser.subscriptions.SubscriptionsManager;
+import org.chromium.chrome.browser.user_education.UserEducationHelper;
 import org.chromium.chrome.test.ChromeActivityTestRule;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.chrome.test.ChromeTabbedActivityTestRule;
@@ -73,6 +74,9 @@
     @Mock
     SubscriptionsManager mSubscriptionsManager;
 
+    @Mock
+    private UserEducationHelper mUserEducationHelper;
+
     private BookmarkSaveFlowCoordinator mBookmarkSaveFlowCoordinator;
     private BottomSheetController mBottomSheetController;
     private BottomSheetTestSupport mBottomSheetTestSupport;
@@ -91,7 +95,7 @@
                     cta.getRootUiCoordinatorForTesting().getBottomSheetController();
             mBottomSheetTestSupport = new BottomSheetTestSupport(mBottomSheetController);
             mBookmarkSaveFlowCoordinator = new BookmarkSaveFlowCoordinator(
-                    cta, mBottomSheetController, mSubscriptionsManager);
+                    cta, mBottomSheetController, mSubscriptionsManager, mUserEducationHelper);
             mBookmarkModel = new BookmarkModel(Profile.fromWebContents(
                     mActivityTestRule.getActivity().getActivityTab().getWebContents()));
             mBookmarkBridge = mActivityTestRule.getActivity().getBookmarkBridgeForTesting();

chrome/android/javatests/src/org/chromium/chrome/browser/firstrun/TosAndUmaFirstRunFragmentWithEnterpriseSupportTest.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/firstrun/TosAndUmaFirstRunFragmentWithEnterpriseSupportTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/firstrun/TosAndUmaFirstRunFragmentWithEnterpriseSupportTest.java
index f7f05437..fe6e7142 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/firstrun/TosAndUmaFirstRunFragmentWithEnterpriseSupportTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/firstrun/TosAndUmaFirstRunFragmentWithEnterpriseSupportTest.java
@@ -4,10 +4,6 @@
 
 package org.chromium.chrome.browser.firstrun;
 
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.assertion.ViewAssertions.doesNotExist;
-import static androidx.test.espresso.matcher.ViewMatchers.withId;
-
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
@@ -553,7 +549,8 @@
         Assert.assertNotNull(tosAndUmaFragment);
         TestThreadUtils.runOnUiThreadBlocking(tosAndUmaFragment::clearFocus);
 
-        onView(withId(R.id.send_report_checkbox)).check(doesNotExist());
+        Assert.assertEquals(
+                "Uma checkbox should not be visible.", View.GONE, mUmaCheckBox.getVisibility());
         renderWithPortraitAndLandscape(tosAndUmaFragment, "fre_tosandumadialog_nopolicy");
     }
 
@@ -574,7 +571,8 @@
         Assert.assertNotNull(tosAndUmaFragment);
         TestThreadUtils.runOnUiThreadBlocking(tosAndUmaFragment::clearFocus);
 
-        onView(withId(R.id.send_report_checkbox)).check(doesNotExist());
+        Assert.assertEquals(
+                "Uma checkbox should not be visible.", View.GONE, mUmaCheckBox.getVisibility());
         renderWithPortraitAndLandscape(
                 tosAndUmaFragment, "fre_tosandumadialog_childaccount_nopolicy");
     }

chrome/android/junit/src/org/chromium/chrome/browser/contextmenu/ContextMenuHeaderMediatorTest.java

diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/contextmenu/ContextMenuHeaderMediatorTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/contextmenu/ContextMenuHeaderMediatorTest.java
index 5c0c00d..ab5a407 100644
--- a/chrome/android/junit/src/org/chromium/chrome/browser/contextmenu/ContextMenuHeaderMediatorTest.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/contextmenu/ContextMenuHeaderMediatorTest.java
@@ -33,6 +33,7 @@
 import org.chromium.base.test.BaseRobolectricTestRunner;
 import org.chromium.base.test.util.JniMocker;
 import org.chromium.blink_public.common.ContextMenuDataMediaType;
+import org.chromium.chrome.R;
 import org.chromium.chrome.browser.performance_hints.PerformanceHintsObserver;
 import org.chromium.chrome.browser.performance_hints.PerformanceHintsObserver.PerformanceClass;
 import org.chromium.chrome.browser.performance_hints.PerformanceHintsObserverJni;
@@ -73,6 +74,7 @@
     @Before
     public void setUpTest() {
         mActivity = Robolectric.setupActivity(Activity.class);
+        mActivity.setTheme(R.style.Theme_BrowserUI_DayNight);
         MockitoAnnotations.initMocks(this);
         mocker.mock(PerformanceHintsObserverJni.TEST_HOOKS, mMockPerformanceHintsObserverJni);
         mocker.mock(LargeIconBridgeJni.TEST_HOOKS, mMockLargeIconBridgeJni);

chrome/app/os_settings_strings.grdp

diff --git a/chrome/app/os_settings_strings.grdp b/chrome/app/os_settings_strings.grdp
index 118a838..c24e4aab 100644
--- a/chrome/app/os_settings_strings.grdp
+++ b/chrome/app/os_settings_strings.grdp
@@ -2324,11 +2324,14 @@
   <message name="IDS_SETTINGS_MOUSE_AND_TOUCHPAD_TITLE" desc="In Device Settings, the title of the mouse and touchpad settings subpage (when the user has both types of devices).">
     Mouse and touchpad
   </message>
-  <message name="IDS_SETTINGS_TOUCHPAD_HAPTIC_FEEDBACK_LABEL" desc="In Device Settings, the text next to the toggle for enabling touchpad haptic feedback.">
-    Enable haptic feedback. <ph name="LINK_BEGIN">&lt;a&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
+  <message name="IDS_SETTINGS_TOUCHPAD_HAPTIC_FEEDBACK_TITLE" desc="In Device Settings, the text next to the toggle for enabling touchpad haptic feedback.">
+    Haptic feedback
   </message>
-  <message name="IDS_SETTINGS_TOUCHPAD_HAPTIC_CLICK_SENSITIVITY_LABEL" translateable="false" desc="In Device Settings, the text next to the slider for setting the touchpad haptic click sensitivity.">
-    Click feedback
+  <message name="IDS_SETTINGS_TOUCHPAD_HAPTIC_FEEDBACK_SECONDARY_TEXT" desc="In Device Settings, the text next to the toggle for enabling touchpad haptic feedback.">
+    Receive vibration confirmation for actions like split screen and switching desks.
+  </message>
+  <message name="IDS_SETTINGS_TOUCHPAD_HAPTIC_CLICK_SENSITIVITY_LABEL" desc="In Device Settings, the text next to the slider for setting the touchpad haptic click sensitivity.">
+    Click strength
   </message>
   <message name="IDS_SETTINGS_TOUCHPAD_HAPTIC_LIGHT_CLICK_LABEL" desc="In Device Settings, the text under the left (less sensitive) side of the slider for the touchpad haptic click sensitivity.">
     Light

chrome/app/os_settings_strings_grdp/IDS_SETTINGS_TOUCHPAD_HAPTIC_CLICK_SENSITIVITY_LABEL.png.sha1

diff --git a/chrome/app/os_settings_strings_grdp/IDS_SETTINGS_TOUCHPAD_HAPTIC_CLICK_SENSITIVITY_LABEL.png.sha1 b/chrome/app/os_settings_strings_grdp/IDS_SETTINGS_TOUCHPAD_HAPTIC_CLICK_SENSITIVITY_LABEL.png.sha1
new file mode 100644
index 0000000..413d03b
--- /dev/null
+++ b/chrome/app/os_settings_strings_grdp/IDS_SETTINGS_TOUCHPAD_HAPTIC_CLICK_SENSITIVITY_LABEL.png.sha1
@@ -0,0 +1 @@
+2555961cad3b8e14e2686b4a7be11a15f195b67b
\ No newline at end of file

chrome/app/os_settings_strings_grdp/IDS_SETTINGS_TOUCHPAD_HAPTIC_FEEDBACK_LABEL.png.sha1

diff --git a/chrome/app/os_settings_strings_grdp/IDS_SETTINGS_TOUCHPAD_HAPTIC_FEEDBACK_LABEL.png.sha1 b/chrome/app/os_settings_strings_grdp/IDS_SETTINGS_TOUCHPAD_HAPTIC_FEEDBACK_LABEL.png.sha1
deleted file mode 100644
index 16e6562..0000000
--- a/chrome/app/os_settings_strings_grdp/IDS_SETTINGS_TOUCHPAD_HAPTIC_FEEDBACK_LABEL.png.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f01f59990bc64b871674efaff3aa350d89855c14
\ No newline at end of file

chrome/app/os_settings_strings_grdp/IDS_SETTINGS_TOUCHPAD_HAPTIC_FEEDBACK_SECONDARY_TEXT.png.sha1

diff --git a/chrome/app/os_settings_strings_grdp/IDS_SETTINGS_TOUCHPAD_HAPTIC_FEEDBACK_SECONDARY_TEXT.png.sha1 b/chrome/app/os_settings_strings_grdp/IDS_SETTINGS_TOUCHPAD_HAPTIC_FEEDBACK_SECONDARY_TEXT.png.sha1
new file mode 100644
index 0000000..1d85113
--- /dev/null
+++ b/chrome/app/os_settings_strings_grdp/IDS_SETTINGS_TOUCHPAD_HAPTIC_FEEDBACK_SECONDARY_TEXT.png.sha1
@@ -0,0 +1 @@
+11ddb7782e2b04aec41ef9e053ce6e216ff33c77
\ No newline at end of file

chrome/app/os_settings_strings_grdp/IDS_SETTINGS_TOUCHPAD_HAPTIC_FEEDBACK_TITLE.png.sha1

diff --git a/chrome/app/os_settings_strings_grdp/IDS_SETTINGS_TOUCHPAD_HAPTIC_FEEDBACK_TITLE.png.sha1 b/chrome/app/os_settings_strings_grdp/IDS_SETTINGS_TOUCHPAD_HAPTIC_FEEDBACK_TITLE.png.sha1
new file mode 100644
index 0000000..0725fd92
--- /dev/null
+++ b/chrome/app/os_settings_strings_grdp/IDS_SETTINGS_TOUCHPAD_HAPTIC_FEEDBACK_TITLE.png.sha1
@@ -0,0 +1 @@
+b49cbab6ea1b5a2456aa89f0cd2cef0de7b97c19
\ No newline at end of file

chrome/browser/ash/app_mode/kiosk_app_data.cc

diff --git a/chrome/browser/ash/app_mode/kiosk_app_data.cc b/chrome/browser/ash/app_mode/kiosk_app_data.cc
index fa8917e..c1764f0 100644
--- a/chrome/browser/ash/app_mode/kiosk_app_data.cc
+++ b/chrome/browser/ash/app_mode/kiosk_app_data.cc
@@ -53,13 +53,8 @@
 
 // Returns true for valid kiosk app manifest.
 bool IsValidKioskAppManifest(const extensions::Manifest& manifest) {
-  bool kiosk_enabled;
-  if (manifest.GetBoolean(extensions::manifest_keys::kKioskEnabled,
-                          &kiosk_enabled)) {
-    return kiosk_enabled;
-  }
-
-  return false;
+  return manifest.FindBoolPath(extensions::manifest_keys::kKioskEnabled)
+      .value_or(false);
 }
 
 std::string ValueToString(const base::Value& value) {

chrome/browser/ash/borealis/borealis_util.cc

diff --git a/chrome/browser/ash/borealis/borealis_util.cc b/chrome/browser/ash/borealis/borealis_util.cc
index 0f2771e..61dce44 100644
--- a/chrome/browser/ash/borealis/borealis_util.cc
+++ b/chrome/browser/ash/borealis/borealis_util.cc
@@ -7,6 +7,7 @@
 #include "base/base64.h"
 #include "base/logging.h"
 #include "base/process/launch.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/stringprintf.h"
 #include "base/system/sys_info.h"
@@ -31,6 +32,7 @@
 // TODO(b/174282035): Potentially update regex when other strings
 // are updated.
 const char kBorealisAppIdRegex[] = "([^/]+\\d+)";
+const char kProtonVersionGameMismatch[] = "UNKNOWN (GameID mismatch)";
 
 namespace {
 
@@ -59,73 +61,6 @@
 static constexpr char kNonGameIdHash2[] = "kooplpnkalpdpoohnhmlmfebokjkgnlb";
 static constexpr char kNonGameIdHash3[] = "bmhgcnboebpgmobfgfjcfplecleopefa";
 
-struct ProtonVersionInfo {
-  std::string proton = "";
-  std::string slr = "";
-};
-
-ProtonVersionInfo GetProtonVersionInfo(absl::optional<int> game_id,
-                                       const std::string& owner_id) {
-  std::vector<std::string> command = {"/usr/bin/vsh", "--owner_id=" + owner_id,
-                                      "--vm_name=borealis", "--",
-                                      "/usr/bin/get_proton_version.py"};
-  std::string output;
-  if (!base::GetAppOutput(command, &output)) {
-    // Re-run with stderr capture. It is not done initially since
-    // GetAppOutputAndError intermixes stdout and stderr and stderr commonly
-    // includes informational messages about Linux game sessions that would
-    // complicate the parsing of `output`.
-    base::GetAppOutputAndError(command, &output);
-    LOG(WARNING) << "Failed to run get_proton_version.py:";
-    LOG(WARNING) << output;
-    return {};
-  }
-
-  // Expected stdout of get_proton_version.py:
-  // Game: <game_id>, Proton:<proton_version>, SLR: <slr_version>, Timestamp: <timestamp>
-  // Game: <game_id>, Proton:<proton_version>, SLR: <slr_version>, Timestamp: <timestamp>
-  // ...
-
-  // Only grab the first line, which is for the last game played.
-  output = output.substr(0, output.find("\n"));
-
-  ProtonVersionInfo version_info;
-  std::string parsed_game_id;
-  base::StringPairs tokenized_info;
-  base::SplitStringIntoKeyValuePairs(output, ':', ',', &tokenized_info);
-  for (const auto& key_val_pair : tokenized_info) {
-    const std::string& key = key_val_pair.first;
-    const std::string& val = key_val_pair.second;
-
-    if (key.compare("GameID") == 0) {
-      parsed_game_id = val;
-    } else if (key.compare("Proton") == 0) {
-      version_info.proton = val;
-    } else if (key.compare("SLR") == 0) {
-      version_info.slr = val;
-    }
-  }
-
-  // If the app id is known and doesn't match, return the version "UNKNOWN"
-  if (game_id.has_value() && !parsed_game_id.empty() &&
-      parsed_game_id.compare(base::StringPrintf("%d", game_id.value())) != 0) {
-    LOG(WARNING) << "Expected GameID " << game_id.value() << " got "
-                 << parsed_game_id;
-    constexpr char kVersionGameMismatch[] = "UNKNOWN (GameID mismatch)";
-    version_info.proton = kVersionGameMismatch;
-    version_info.slr = kVersionGameMismatch;
-  } else {
-    if (version_info.proton.empty()) {
-      LOG(WARNING) << "Found an unexpected empty Proton version.";
-    }
-    if (version_info.slr.empty()) {
-      LOG(WARNING) << "Found an unexpected empty SLR version.";
-    }
-  }
-
-  return version_info;
-}
-
 GURL GetSysInfoForUrlAsync(GURL url,
                            absl::optional<int> game_id,
                            std::string owner_id) {
@@ -140,7 +75,14 @@
   url = net::AppendQueryParameter(url, kPlatformVersionKey,
                                   base::SysInfo::OperatingSystemVersion());
 
-  ProtonVersionInfo version_info = GetProtonVersionInfo(game_id, owner_id);
+  borealis::ProtonVersionInfo version_info = {};
+  std::string output;
+  if (borealis::GetProtonVersionInfo(owner_id, &output)) {
+    version_info = borealis::ParseProtonVersionInfo(game_id, output);
+  } else {
+    LOG(WARNING) << "Failed to run get_proton_version.py:";
+    LOG(WARNING) << output;
+  }
   if (!version_info.proton.empty()) {
     url =
         net::AppendQueryParameter(url, kProtonVersionKey, version_info.proton);
@@ -240,4 +182,69 @@
   }
   return false;
 }
+
+bool GetProtonVersionInfo(const std::string& owner_id, std::string* output) {
+  std::vector<std::string> command = {"/usr/bin/vsh", "--owner_id=" + owner_id,
+                                      "--vm_name=borealis", "--",
+                                      "/usr/bin/get_proton_version.py"};
+  bool success = base::GetAppOutput(command, output);
+  if (!success) {
+    // Re-run with stderr capture. It is not done initially since
+    // GetAppOutputAndError intermixes stdout and stderr and stderr commonly
+    // includes informational messages about Linux game sessions that would
+    // complicate the parsing of `output`.
+    base::GetAppOutputAndError(command, output);
+  }
+  return success;
+}
+
+ProtonVersionInfo ParseProtonVersionInfo(absl::optional<int> game_id,
+                                         const std::string& output) {
+  // Expected stdout of get_proton_version.py:
+  // GameID: <game_id>, Proton:<proton_version>, SLR: <slr_version>, Timestamp: <timestamp>
+  // GameID: <game_id>, Proton:<proton_version>, SLR: <slr_version>, Timestamp: <timestamp>
+  // ...
+
+  // Only grab the first line, which is for the last game played.
+  std::string raw_info = output.substr(0, output.find("\n"));
+
+  ProtonVersionInfo version_info;
+  std::string parsed_game_id;
+  base::StringPairs tokenized_info;
+  base::SplitStringIntoKeyValuePairs(raw_info, ':', ',', &tokenized_info);
+  for (const auto& key_val_pair : tokenized_info) {
+    std::string key;
+    TrimWhitespaceASCII(key_val_pair.first, base::TRIM_ALL, &key);
+
+    std::string val;
+    TrimWhitespaceASCII(key_val_pair.second, base::TRIM_ALL, &val);
+
+    if (key == "GameID") {
+      parsed_game_id = val;
+    } else if (key == "Proton") {
+      version_info.proton = val;
+    } else if (key == "SLR") {
+      version_info.slr = val;
+    }
+  }
+
+  // If the app id is known and doesn't match, return the version "UNKNOWN"
+  if (game_id.has_value() && !parsed_game_id.empty() &&
+      parsed_game_id != base::NumberToString(game_id.value())) {
+    LOG(WARNING) << "Expected GameID " << game_id.value() << " got "
+                 << parsed_game_id;
+    version_info.proton = kProtonVersionGameMismatch;
+    version_info.slr = kProtonVersionGameMismatch;
+  } else if (!parsed_game_id.empty()) {
+    if (version_info.proton.empty()) {
+      LOG(WARNING) << "Found an unexpected empty Proton version.";
+    }
+    if (version_info.slr.empty()) {
+      LOG(WARNING) << "Found an unexpected empty SLR version.";
+    }
+  }
+
+  return version_info;
+}
+
 }  // namespace borealis

chrome/browser/ash/borealis/borealis_util.h

diff --git a/chrome/browser/ash/borealis/borealis_util.h b/chrome/browser/ash/borealis/borealis_util.h
index 5091c8f..014b3eab 100644
--- a/chrome/browser/ash/borealis/borealis_util.h
+++ b/chrome/browser/ash/borealis/borealis_util.h
@@ -34,6 +34,15 @@
 extern const char kAllowedScheme[];
 // Base64-encoded allow list of URLs that can be handled by Borealis apps.
 extern const base::StringPiece kURLAllowlist[];
+// Error string to replace Proton version info in the event that a GameID
+// parsed with /usr/bin/get_proton_version.py in the Borealis VM does not
+// match the GameID expected based on extraction with kBorealisAppIdRegex.
+extern const char kProtonVersionGameMismatch[];
+
+struct ProtonVersionInfo {
+  std::string proton = "";
+  std::string slr = "";
+};
 
 // Shows the Borealis installer (borealis_installer_view).
 void ShowBorealisInstallerView(Profile* profile);
@@ -63,6 +72,14 @@
 // with one of the URLs in the allowlist.
 bool IsExternalURLAllowed(const GURL& url);
 
+// Executes /usr/bin/get_proton_version.py in the borealis VM, which outputs
+// the Proton version information of any recent Proton game session.
+bool GetProtonVersionInfo(const std::string& owner_id, std::string* output);
+
+// Parses the output returned by GetProtonVersionInfo.
+ProtonVersionInfo ParseProtonVersionInfo(absl::optional<int> game_id,
+                                         const std::string& output);
+
 }  // namespace borealis
 
 #endif  // CHROME_BROWSER_ASH_BOREALIS_BOREALIS_UTIL_H_

chrome/browser/ash/borealis/borealis_util_unittest.cc

diff --git a/chrome/browser/ash/borealis/borealis_util_unittest.cc b/chrome/browser/ash/borealis/borealis_util_unittest.cc
index 5d0c852..1ced952c 100644
--- a/chrome/browser/ash/borealis/borealis_util_unittest.cc
+++ b/chrome/browser/ash/borealis/borealis_util_unittest.cc
@@ -97,5 +97,71 @@
   EXPECT_EQ(entries, 4);  // we currently prefill this many form fields
 }
 
+TEST_F(BorealisUtilTest, ProtonVersionProtonTitle) {
+  absl::optional<int> game_id;
+  std::string output =
+      "GameID: 123, Proton: Proton 1.2-3, SLR: SLR - Name, "
+      "Timestamp: 2021-01-01 00:00:00";
+  borealis::ProtonVersionInfo info =
+      borealis::ParseProtonVersionInfo(game_id, output);
+  EXPECT_EQ(info.proton, "Proton 1.2-3");
+  EXPECT_EQ(info.slr, "SLR - Name");
+}
+
+TEST_F(BorealisUtilTest, ProtonVersionProtonTitleMultiLine) {
+  absl::optional<int> game_id;
+  std::string output =
+      "GameID: 123, Proton: Proton 1.2-3, SLR: SLR - Name, "
+      "Timestamp: 2021-01-01 00:00:00\n"
+      "GameID: 456, Proton: Proton 4.5-6, SLR: SLR - Name2, "
+      "Timestamp: 2021-01-01 00:00:00";
+  borealis::ProtonVersionInfo info =
+      borealis::ParseProtonVersionInfo(game_id, output);
+  EXPECT_EQ(info.proton, "Proton 1.2-3");
+  EXPECT_EQ(info.slr, "SLR - Name");
+}
+
+TEST_F(BorealisUtilTest, ProtonVersionProtonTitleWithGameId) {
+  absl::optional<int> game_id = 123;
+  std::string output =
+      "GameID: 123, Proton: Proton 1.2-3, SLR: SLR - Name, "
+      "Timestamp: 2021-01-01 00:00:00";
+  borealis::ProtonVersionInfo info =
+      borealis::ParseProtonVersionInfo(game_id, output);
+  EXPECT_EQ(info.proton, "Proton 1.2-3");
+  EXPECT_EQ(info.slr, "SLR - Name");
+}
+
+TEST_F(BorealisUtilTest, ProtonVersionProtonTitleWithGameIdMismatch) {
+  absl::optional<int> game_id = 123;
+  std::string output =
+      "GameID: 456, Proton: Proton 1.2-3, SLR: SLR - Name, "
+      "Timestamp: 2021-01-01 00:00:00";
+  borealis::ProtonVersionInfo info =
+      borealis::ParseProtonVersionInfo(game_id, output);
+  EXPECT_EQ(info.proton, borealis::kProtonVersionGameMismatch);
+  EXPECT_EQ(info.slr, borealis::kProtonVersionGameMismatch);
+}
+
+TEST_F(BorealisUtilTest, ProtonVersionLinuxTitle) {
+  absl::optional<int> game_id;
+  std::string output =
+      "INFO: Found a session for a Linux game at timestamp 2021-01-01 00:00:00";
+  borealis::ProtonVersionInfo info =
+      borealis::ParseProtonVersionInfo(game_id, output);
+  EXPECT_THAT(info.proton, testing::IsEmpty());
+  EXPECT_THAT(info.slr, testing::IsEmpty());
+}
+
+TEST_F(BorealisUtilTest, ProtonVersionLinuxTitleWithGameId) {
+  absl::optional<int> game_id = 123;
+  std::string output =
+      "INFO: Found a session for a Linux game at timestamp 2021-01-01 00:00:00";
+  borealis::ProtonVersionInfo info =
+      borealis::ParseProtonVersionInfo(game_id, output);
+  EXPECT_THAT(info.proton, testing::IsEmpty());
+  EXPECT_THAT(info.slr, testing::IsEmpty());
+}
+
 }  // namespace
 }  // namespace borealis

chrome/browser/ash/policy/reporting/metrics_reporting/cros_healthd_metric_sampler.cc

diff --git a/chrome/browser/ash/policy/reporting/metrics_reporting/cros_healthd_metric_sampler.cc b/chrome/browser/ash/policy/reporting/metrics_reporting/cros_healthd_metric_sampler.cc
index 9096b1a..44cb048 100644
--- a/chrome/browser/ash/policy/reporting/metrics_reporting/cros_healthd_metric_sampler.cc
+++ b/chrome/browser/ash/policy/reporting/metrics_reporting/cros_healthd_metric_sampler.cc
@@ -122,10 +122,55 @@
   }
 }
 
-void OnHealthdInfoReceived(MetricCallback callback,
-                           cros_healthd::ProbeCategoryEnum probe_category,
-                           CrosHealthdMetricSampler::MetricType metric_type,
-                           cros_healthd::TelemetryInfoPtr result) {
+void HandleAudioResult(MetricCallback callback,
+                       CrosHealthdMetricSampler::MetricType metric_type,
+                       chromeos::cros_healthd::mojom::TelemetryInfoPtr result) {
+  bool anything_reported = false;
+  MetricData metric_data;
+  auto* const audio_info_out =
+      metric_data.mutable_telemetry_data()->mutable_audio_telemetry();
+  const auto& audio_result = result->audio_result;
+
+  if (!audio_result.is_null()) {
+    switch (audio_result->which()) {
+      case chromeos::cros_healthd::mojom::AudioResult::Tag::ERROR: {
+        DVLOG(1) << "CrosHealthD: Error getting audio telemetry: "
+                 << audio_result->get_error()->msg;
+        break;
+      }
+
+      case chromeos::cros_healthd::mojom::AudioResult::Tag::AUDIO_INFO: {
+        const auto& audio_info = audio_result->get_audio_info();
+        if (audio_info.is_null()) {
+          DVLOG(1) << "CrosHealthD: No audio info received";
+          break;
+        }
+
+        if (metric_type == CrosHealthdMetricSampler::MetricType::kTelemetry) {
+          audio_info_out->set_output_mute(audio_info->output_mute);
+          audio_info_out->set_input_mute(audio_info->input_mute);
+          audio_info_out->set_output_volume(audio_info->output_volume);
+          audio_info_out->set_output_device_name(
+              audio_info->output_device_name);
+          audio_info_out->set_input_gain(audio_info->input_gain);
+          audio_info_out->set_input_device_name(audio_info->input_device_name);
+          anything_reported = true;
+        }
+        break;
+      }
+    }
+  }
+
+  if (anything_reported) {
+    std::move(callback).Run(metric_data);
+  }
+}
+
+void OnHealthdInfoReceived(
+    MetricCallback callback,
+    cros_healthd::ProbeCategoryEnum probe_category,
+    CrosHealthdMetricSampler::MetricType metric_type,
+    chromeos::cros_healthd::mojom::TelemetryInfoPtr result) {
   if (!result) {
     DVLOG(1) << "cros_healthd: null telemetry result";
     return;
@@ -140,6 +185,10 @@
       HandleBusResult(std::move(callback), metric_type, std::move(result));
       break;
     }
+    case cros_healthd::ProbeCategoryEnum::kAudio: {
+      HandleAudioResult(std::move(callback), metric_type, std::move(result));
+      break;
+    }
     default: {
       NOTREACHED();
       return;

chrome/browser/ash/policy/reporting/metrics_reporting/cros_healthd_metric_sampler_unittest.cc

diff --git a/chrome/browser/ash/policy/reporting/metrics_reporting/cros_healthd_metric_sampler_unittest.cc b/chrome/browser/ash/policy/reporting/metrics_reporting/cros_healthd_metric_sampler_unittest.cc
index 68f7d20..2a1b4377 100644
--- a/chrome/browser/ash/policy/reporting/metrics_reporting/cros_healthd_metric_sampler_unittest.cc
+++ b/chrome/browser/ash/policy/reporting/metrics_reporting/cros_healthd_metric_sampler_unittest.cc
@@ -10,9 +10,11 @@
 #include "chromeos/dbus/cros_healthd/fake_cros_healthd_client.h"
 #include "chromeos/services/cros_healthd/public/cpp/service_connection.h"
 #include "components/reporting/util/test_support_callbacks.h"
+#include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cros_healthd = chromeos::cros_healthd::mojom;
+using ::testing::Eq;
 
 struct TbtTestCase {
   std::string test_name;
@@ -60,6 +62,28 @@
   return telemetry_info;
 }
 
+cros_healthd::AudioInfoPtr CreateAudioInfo(
+    bool output_mute,
+    bool input_mute,
+    uint64_t output_volume,
+    const std::string& output_device_name,
+    uint32_t input_gain,
+    const std::string& input_device_name,
+    uint32_t underruns,
+    uint32_t severe_underruns) {
+  return cros_healthd::AudioInfo::New(
+      output_mute, input_mute, output_volume, output_device_name, input_gain,
+      input_device_name, underruns, severe_underruns);
+}
+
+cros_healthd::TelemetryInfoPtr CreateAudioResult(
+    cros_healthd::AudioInfoPtr audio_info) {
+  auto telemetry_info = cros_healthd::TelemetryInfo::New();
+  telemetry_info->audio_result =
+      cros_healthd::AudioResult::NewAudioInfo(std::move(audio_info));
+  return telemetry_info;
+}
+
 MetricData CollectData(cros_healthd::TelemetryInfoPtr telemetry_info,
                        cros_healthd::ProbeCategoryEnum probe_category,
                        CrosHealthdMetricSampler::MetricType metric_type) {
@@ -134,7 +158,7 @@
   EXPECT_TRUE(result.info_data().cpu_info().keylocker_info().supported());
 }
 
-TEST_F(CrosHealthdMetricSamplerTest, TestUnconfigured) {
+TEST_F(CrosHealthdMetricSamplerTest, TestKeylockerUnconfigured) {
   MetricData result = CollectData(CreateCpuResult(CreateKeylockerInfo(false)),
                                   cros_healthd::ProbeCategoryEnum::kCpu,
                                   CrosHealthdMetricSampler::MetricType::kInfo);
@@ -177,6 +201,51 @@
       CrosHealthdMetricSampler::MetricType::kInfo);
 
   ASSERT_FALSE(bus_data.has_info_data());
+
+  telemetry_info = cros_healthd::TelemetryInfo::New();
+  telemetry_info->audio_result =
+      cros_healthd::AudioResult::NewError(cros_healthd::ProbeError::New(
+          cros_healthd::ErrorType::kFileReadError, ""));
+  const auto& audio_data = CollectError(
+      std::move(telemetry_info), cros_healthd::ProbeCategoryEnum::kAudio,
+      CrosHealthdMetricSampler::MetricType::kTelemetry);
+  ASSERT_FALSE(audio_data.has_telemetry_data());
+}
+
+TEST_F(CrosHealthdMetricSamplerTest, TestAudioNormalTest) {
+  MetricData result = CollectData(
+      CreateAudioResult(CreateAudioInfo(
+          /*output_mute=*/true,
+          /*input_mute=*/true, /*output_volume=*/25,
+          /*output_device_name=*/"airpods",
+          /*input_gain=*/50, /*input_device_name=*/"airpods", /*underruns=*/2,
+          /*severe_underruns=*/2)),
+      cros_healthd::ProbeCategoryEnum::kAudio,
+      CrosHealthdMetricSampler::MetricType::kTelemetry);
+
+  ASSERT_TRUE(result.has_telemetry_data());
+  ASSERT_TRUE(result.telemetry_data().has_audio_telemetry());
+  ASSERT_TRUE(result.telemetry_data().audio_telemetry().output_mute());
+  ASSERT_THAT(result.telemetry_data().audio_telemetry().output_volume(),
+              Eq(25));
+}
+
+TEST_F(CrosHealthdMetricSamplerTest, TestAudioEmptyTest) {
+  MetricData result = CollectData(
+      CreateAudioResult(CreateAudioInfo(
+          /*output_mute=*/false,
+          /*input_mute=*/false, /*output_volume=*/0,
+          /*output_device_name=*/"",
+          /*input_gain=*/0, /*input_device_name=*/"", /*underruns=*/0,
+          /*severe_underruns=*/0)),
+      cros_healthd::ProbeCategoryEnum::kAudio,
+      CrosHealthdMetricSampler::MetricType::kTelemetry);
+
+  ASSERT_TRUE(result.has_telemetry_data());
+  ASSERT_TRUE(result.telemetry_data().has_audio_telemetry());
+  ASSERT_FALSE(result.telemetry_data().audio_telemetry().output_mute());
+  ASSERT_FALSE(result.telemetry_data().audio_telemetry().input_mute());
+  ASSERT_THAT(result.telemetry_data().audio_telemetry().output_volume(), Eq(0));
 }
 
 INSTANTIATE_TEST_SUITE_P(

chrome/browser/content_creation/reactions/internal/android/java/src/org/chromium/chrome/browser/content_creation/reactions/scene/ReactionLayout.java

diff --git a/chrome/browser/content_creation/reactions/internal/android/java/src/org/chromium/chrome/browser/content_creation/reactions/scene/ReactionLayout.java b/chrome/browser/content_creation/reactions/internal/android/java/src/org/chromium/chrome/browser/content_creation/reactions/scene/ReactionLayout.java
index 4d8e273..b861361 100644
--- a/chrome/browser/content_creation/reactions/internal/android/java/src/org/chromium/chrome/browser/content_creation/reactions/scene/ReactionLayout.java
+++ b/chrome/browser/content_creation/reactions/internal/android/java/src/org/chromium/chrome/browser/content_creation/reactions/scene/ReactionLayout.java
@@ -120,7 +120,7 @@
                 int screenHeight = mContext.getResources().getDisplayMetrics().heightPixels;
                 switch (motionEvent.getAction()) {
                     case MotionEvent.ACTION_DOWN:
-                        mSceneEditorDelegate.reactionWasMoved();
+                        mSceneEditorDelegate.reactionWasMoved(ReactionLayout.this);
                         mBaseX = motionEvent.getRawX() - layoutParams.leftMargin;
                         mBaseY = motionEvent.getRawY() - layoutParams.topMargin;
                         mHeight = layoutParams.height;

chrome/browser/content_creation/reactions/internal/android/java/src/org/chromium/chrome/browser/content_creation/reactions/scene/SceneCoordinator.java

diff --git a/chrome/browser/content_creation/reactions/internal/android/java/src/org/chromium/chrome/browser/content_creation/reactions/scene/SceneCoordinator.java b/chrome/browser/content_creation/reactions/internal/android/java/src/org/chromium/chrome/browser/content_creation/reactions/scene/SceneCoordinator.java
index c8cee33f..42bf8bd 100644
--- a/chrome/browser/content_creation/reactions/internal/android/java/src/org/chromium/chrome/browser/content_creation/reactions/scene/SceneCoordinator.java
+++ b/chrome/browser/content_creation/reactions/internal/android/java/src/org/chromium/chrome/browser/content_creation/reactions/scene/SceneCoordinator.java
@@ -24,9 +24,13 @@
 import org.chromium.ui.LayoutInflaterUtils;
 import org.chromium.ui.base.ViewUtils;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -41,6 +45,8 @@
     private final Activity mActivity;
     private final LightweightReactionsMediator mMediator;
     private final Set<ReactionLayout> mReactionLayouts;
+    private final Map<ReactionLayout, Integer> mInitialPositionByReaction;
+    private final List<Integer> mNumReactionsInPosition;
 
     private ReactionLayout mActiveReaction;
     private RelativeLayout mSceneBackground;
@@ -62,6 +68,8 @@
         mActivity = activity;
         mMediator = mediator;
         mReactionLayouts = new HashSet<>();
+        mInitialPositionByReaction = new HashMap<>();
+        mNumReactionsInPosition = new ArrayList<>();
 
         mNbReactionsAdded = 0;
         mNbTypeChange = 0;
@@ -97,13 +105,24 @@
             Resources res = mActivity.getResources();
             int screenWidth = res.getDisplayMetrics().widthPixels;
             int screenHeight = res.getDisplayMetrics().heightPixels;
-            int leftPx = screenWidth / 2 - reactionSizePx / 2;
+            int offsetPx = ViewUtils.dpToPx(mActivity, REACTION_OFFSET_DP);
+            int maxOffsetNum = Math.min((screenWidth - reactionSizePx) / 2 / offsetPx,
+                    (screenHeight - reactionSizePx) / 2 / offsetPx);
+            int offsetNum = Math.min(getFreePosition(), maxOffsetNum);
+            int leftPx = screenWidth / 2 - reactionSizePx / 2 + offsetNum * offsetPx;
             int topPx = screenHeight / 2 - reactionSizePx / 2
-                    - res.getDimensionPixelSize(R.dimen.toolbar_total_height);
+                    - res.getDimensionPixelSize(R.dimen.toolbar_total_height)
+                    + offsetNum * offsetPx;
             int rightPx = screenWidth - (leftPx - reactionSizePx);
             int bottomPx = screenHeight - (topPx - reactionSizePx);
             lp.setMargins(leftPx, topPx, rightPx, bottomPx);
 
+            mInitialPositionByReaction.put(reactionLayout, offsetNum);
+            if (offsetNum < mNumReactionsInPosition.size()) {
+                mNumReactionsInPosition.set(offsetNum, mNumReactionsInPosition.get(offsetNum) + 1);
+            } else {
+                mNumReactionsInPosition.add(1);
+            }
             addReactionLayoutToScene(reactionLayout, lp);
         });
     }
@@ -291,6 +310,7 @@
         ++mNbDelete;
         markActiveStatus(reactionLayout, false);
         mSceneBackground.removeView(reactionLayout);
+        removeReactionLayoutFromInitialPosition(reactionLayout);
         mReactionLayouts.remove(reactionLayout);
     }
 
@@ -310,8 +330,9 @@
     }
 
     @Override
-    public void reactionWasMoved() {
+    public void reactionWasMoved(ReactionLayout reactionLayout) {
         ++mNbMove;
+        removeReactionLayoutFromInitialPosition(reactionLayout);
     }
 
     @Override
@@ -366,6 +387,22 @@
         }
     }
 
+    private void removeReactionLayoutFromInitialPosition(ReactionLayout reactionLayout) {
+        Integer index = mInitialPositionByReaction.remove(reactionLayout);
+        if (index != null) {
+            mNumReactionsInPosition.set(index, mNumReactionsInPosition.get(index) - 1);
+        }
+    }
+
+    private int getFreePosition() {
+        for (int i = 0; i < mNumReactionsInPosition.size(); i++) {
+            if (mNumReactionsInPosition.get(i) == 0) {
+                return i;
+            }
+        }
+        return mNumReactionsInPosition.size();
+    }
+
     private boolean isOutOfBoundsToTheBottomRight(
             RelativeLayout.LayoutParams layoutParams, float rotation) {
         Resources res = mActivity.getResources();

chrome/browser/content_creation/reactions/internal/android/java/src/org/chromium/chrome/browser/content_creation/reactions/scene/SceneEditorDelegate.java

diff --git a/chrome/browser/content_creation/reactions/internal/android/java/src/org/chromium/chrome/browser/content_creation/reactions/scene/SceneEditorDelegate.java b/chrome/browser/content_creation/reactions/internal/android/java/src/org/chromium/chrome/browser/content_creation/reactions/scene/SceneEditorDelegate.java
index 82565e66..94ba4ae 100644
--- a/chrome/browser/content_creation/reactions/internal/android/java/src/org/chromium/chrome/browser/content_creation/reactions/scene/SceneEditorDelegate.java
+++ b/chrome/browser/content_creation/reactions/internal/android/java/src/org/chromium/chrome/browser/content_creation/reactions/scene/SceneEditorDelegate.java
@@ -31,7 +31,7 @@
     /**
      * Invoked when a reaction is dragged across the editing surface.
      */
-    void reactionWasMoved();
+    void reactionWasMoved(ReactionLayout reactionLayout);
 
     /**
      * Invoked when the scale / rotate editing control of a reaction is interacted with.

chrome/browser/download/internal/android/BUILD.gn

diff --git a/chrome/browser/download/internal/android/BUILD.gn b/chrome/browser/download/internal/android/BUILD.gn
index a2ea625..885a40ee 100644
--- a/chrome/browser/download/internal/android/BUILD.gn
+++ b/chrome/browser/download/internal/android/BUILD.gn
@@ -137,6 +137,7 @@
 
 android_resources("java_resources") {
   sources = [
+    "java/res/drawable-v24/circular_progress_bar_background_small.xml",
     "java/res/drawable/circular_progress_bar_background_large.xml",
     "java/res/drawable/circular_progress_bar_background_small.xml",
     "java/res/drawable/circular_progress_bar_determinate_large.xml",

chrome/browser/download/internal/android/java/res/drawable-v24/circular_progress_bar_background_small.xml

diff --git a/chrome/browser/download/internal/android/java/res/drawable-v24/circular_progress_bar_background_small.xml b/chrome/browser/download/internal/android/java/res/drawable-v24/circular_progress_bar_background_small.xml
new file mode 100644
index 0000000..51a7816
--- /dev/null
+++ b/chrome/browser/download/internal/android/java/res/drawable-v24/circular_progress_bar_background_small.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2021 The Chromium Authors. All rights reserved.
+     Use of this source code is governed by a BSD-style license that can be
+     found in the LICENSE file. -->
+
+<org.chromium.components.browser_ui.widget.SurfaceColorDrawable
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    app:surfaceElevation="@dimen/default_elevation_1"
+    android:shape="oval">
+</org.chromium.components.browser_ui.widget.SurfaceColorDrawable>

chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl.cc

diff --git a/chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl.cc b/chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl.cc
index d5654e6..87dafa3 100644
--- a/chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl.cc
+++ b/chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl.cc
@@ -63,7 +63,26 @@
 }
 
 void DeviceTrustKeyManagerImpl::StartKeyRotation(const std::string& nonce) {
-  NOTIMPLEMENTED();
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+  if (state_ == InitializationState::kDefault) {
+    // Update the state right now to mark new client requests as pending.
+    state_ = InitializationState::kRotatingKey;
+
+    // Make sure to "drain" the background sequence from pending tasks before
+    // attempting to rotate the key. This is done by changing the state (no new
+    // incoming requests will be added to the background sequence), and then
+    // putting a DoNothing on the sequence and getting the task runner to reply
+    // with our callback on the UI Thread after that. This way, once the
+    // callback runs, it is running on the UI thread and also the background
+    // sequence is empty.
+    background_task_runner_->PostTaskAndReply(
+        FROM_HERE, base::DoNothing(),
+        base::BindOnce(&DeviceTrustKeyManagerImpl::StartKeyRotationInner,
+                       weak_factory_.GetWeakPtr(), nonce));
+    return;
+  }
+
+  pending_rotation_nonce_ = nonce;
 }
 
 void DeviceTrustKeyManagerImpl::ExportPublicKeyAsync(
@@ -140,6 +159,18 @@
   }
 
   state_ = InitializationState::kDefault;
+  LogKeyLoadingResult(GetLoadedKeyMetadata());
+
+  // Do this check after caching the previous key as failure to rotate will
+  // restore it in persistence.
+  if (pending_rotation_nonce_.has_value()) {
+    // In this edge case, a rotate key request came in at the same time
+    // as the key was being loaded. In this case, just start a rotate flow again
+    // using the pending nonce. The function can be called directly as the
+    // background sequence is guaranteed to be empty at this point.
+    StartKeyRotationInner(pending_rotation_nonce_.value());
+    return;
+  }
 
   if (!IsFullyInitialized() && create_on_fail) {
     // Key loading failed, so we can kick-off the key creation. This is
@@ -149,8 +180,6 @@
     return;
   }
 
-  LogKeyLoadingResult(GetLoadedKeyMetadata());
-
   // Respond to callbacks. If a key was loaded, these callbacks will be
   // successfully answered to. If a key was not loaded, then might as well
   // respond with a failure instead of keeping them waiting even longer.
@@ -165,23 +194,50 @@
 
   KeyRotationCommand::Callback rotation_finished_callback =
       base::BindOnce(&DeviceTrustKeyManagerImpl::OnKeyRotationFinished,
-                     weak_factory_.GetWeakPtr(), !nonce.empty());
+                     weak_factory_.GetWeakPtr(), nonce);
 
   key_rotation_launcher_->LaunchKeyRotation(
       nonce, std::move(rotation_finished_callback));
 }
 
 void DeviceTrustKeyManagerImpl::OnKeyRotationFinished(
-    bool had_nonce,
+    const std::string& nonce,
     KeyRotationCommand::Status result_status) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+
+  LogKeyRotationResult(/*had_nonce=*/!nonce.empty(), result_status);
+
   key_rotation_succeeded_ =
       result_status == KeyRotationCommand::Status::SUCCEEDED;
   state_ = InitializationState::kDefault;
 
-  LogKeyRotationResult(had_nonce, result_status);
+  if (pending_rotation_nonce_.has_value()) {
+    if (pending_rotation_nonce_.value() == nonce) {
+      // Key rotation using the nonce completed.
+      pending_rotation_nonce_.reset();
+    } else if (!key_rotation_succeeded_) {
+      // In this edge case, another rotate key request came in at the same time
+      // as the current request was being executed. In this case, just go
+      // through the rotate flow again using the new nonce. The function can be
+      // called directly as the background sequence is guaranteed to be empty at
+      // this point.
+      // This specific case is guarded behind the current rotation process
+      // having failed because, if it had succeeded, the LoadKey below would get
+      // invoked and would eventually start the rotation as well.
+      StartKeyRotation(pending_rotation_nonce_.value());
+      return;
+    }
+  }
 
   if (key_rotation_succeeded_) {
+    // In normal key creation/rotation flow, loading the key after having
+    // updated persistence is a pretty straightforward thing to do.
+    // In the event where `pending_rotation_nonce_` still has a value (meaning
+    // there was a concurrent rotate request), LoadKey will take care of that
+    // pending request in its own flow. This is better than kicking-off rotation
+    // directly from here in the case where the pending rotation request fails -
+    // then the manager would have already loaded the key that will remain
+    // persisted.
     LoadKey(/*create_on_fail=*/false);
     return;
   }

chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl.h

diff --git a/chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl.h b/chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl.h
index a03c578..3c3fd0d 100644
--- a/chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl.h
+++ b/chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl.h
@@ -58,9 +58,9 @@
   void StartKeyRotationInner(const std::string& nonce);
 
   // Invoked when the background key rotation tasks completes with a
-  // `result_status`. `had_nonce` represents whether the process was given a
-  // nonce parameter when started or not.
-  void OnKeyRotationFinished(bool had_nonce,
+  // `result_status`. `nonce` captures the parameter given to that process
+  // when it was started.
+  void OnKeyRotationFinished(const std::string& nonce,
                              KeyRotationCommand::Status result_status);
 
   // Adds `pending_request` to the list of pending client requests. Also calls
@@ -98,7 +98,14 @@
   // Represents whether the last key rotation process was successful or not.
   bool key_rotation_succeeded_{false};
 
+  // Potentially holds the nonce value for a remote key rotation request.
+  // Whenever the key manager is done doing what it is currently doing, it will
+  // start a key rotation process with it.
+  absl::optional<std::string> pending_rotation_nonce_;
+
   // Runner for tasks needed to be run in the background.
+  // TODO(b/210108864): Add background tasks counter to allow DCHECKing that
+  // no tasks are running the background during key rotation.
   scoped_refptr<base::SequencedTaskRunner> background_task_runner_;
 
   // Checker used to validate that non-background tasks should be

chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl_unittest.cc

diff --git a/chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl_unittest.cc b/chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl_unittest.cc
index 5120037..289e9d21 100644
--- a/chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl_unittest.cc
+++ b/chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl_unittest.cc
@@ -8,9 +8,11 @@
 #include "base/callback_forward.h"
 #include "base/memory/raw_ptr.h"
 #include "base/run_loop.h"
+#include "base/task/bind_post_task.h"
 #include "base/test/bind.h"
 #include "base/test/metrics/histogram_tester.h"
 #include "base/test/task_environment.h"
+#include "base/threading/sequenced_task_runner_handle.h"
 #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/key_rotation_launcher.h"
 #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/metrics_utils.h"
 #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/mock_key_rotation_launcher.h"
@@ -32,6 +34,8 @@
 
 namespace {
 
+constexpr char kFakeNonce[] = "fake nonce";
+constexpr char kOtherFakeNonce[] = "other fake nonce";
 constexpr char kFakeData[] = "some fake string";
 
 constexpr char kLoadedKeyTrustLevelHistogram[] =
@@ -86,12 +90,12 @@
 
   void RunUntilIdle() { task_environment_.RunUntilIdle(); }
 
-  void ExpectLoadedTpmKeyMetrics() {
+  void ExpectLoadedTpmKeyMetrics(int times_loaded = 1) {
     // A TPM-generated key was successfully loaded. We don't know which
     // algorithm was used though, so just check that it was logged only once.
     histogram_tester_.ExpectUniqueSample(kLoadedKeyTrustLevelHistogram,
-                                         DTKeyTrustLevel::kTpm, 1);
-    histogram_tester_.ExpectTotalCount(kLoadedKeyTypeHistogram, 1);
+                                         DTKeyTrustLevel::kTpm, times_loaded);
+    histogram_tester_.ExpectTotalCount(kLoadedKeyTypeHistogram, times_loaded);
   }
 
   void ExpectKeyCreatedMetrics() {
@@ -100,18 +104,57 @@
     histogram_tester_.ExpectTotalCount(kKeyRotationResultHistogram, 0);
   }
 
+  void ExpectSuccessKeyRotateMetrics(int times_rotated = 1) {
+    histogram_tester_.ExpectUniqueSample(kKeyRotationResultHistogram,
+                                         DTKeyRotationResult::kSucceeded,
+                                         times_rotated);
+    histogram_tester_.ExpectTotalCount(kKeyCreationResultHistogram, 0);
+  }
+
+  void ExpectFailedKeyRotateMetrics() {
+    histogram_tester_.ExpectUniqueSample(kKeyRotationResultHistogram,
+                                         DTKeyRotationResult::kFailed, 1);
+    histogram_tester_.ExpectTotalCount(kKeyCreationResultHistogram, 0);
+  }
+
+  void InitializeWithKey() {
+    SetUpPersistedKey();
+
+    key_manager_->StartInitialization();
+
+    ExpectManagerHandlesRequests();
+
+    ExpectLoadedTpmKeyMetrics();
+    histogram_tester_.ExpectTotalCount(kKeyCreationResultHistogram, 0);
+    histogram_tester_.ExpectTotalCount(kKeyRotationResultHistogram, 0);
+  }
+
+  // Expects that the key manager can handle an incoming request successfully,
+  // which means it holds a valid key.
+  void ExpectManagerHandlesRequests() {
+    base::RunLoop run_loop;
+    key_manager_->ExportPublicKeyAsync(base::BindLambdaForTesting(
+        [&run_loop](absl::optional<std::string> value) {
+          EXPECT_TRUE(value);
+          EXPECT_FALSE(value->empty());
+          run_loop.Quit();
+        }));
+
+    run_loop.Run();
+  }
+
   DeviceTrustKeyManagerImpl* key_manager() { return key_manager_.get(); }
   StrictMock<MockKeyRotationLauncher>* mock_launcher() {
     return mock_launcher_;
   }
 
   base::HistogramTester histogram_tester_;
+  test::ScopedKeyPersistenceDelegateFactory persistence_delegate_factory_;
 
  private:
   base::test::TaskEnvironment task_environment_{
       base::test::TaskEnvironment::TimeSource::MOCK_TIME};
 
-  test::ScopedKeyPersistenceDelegateFactory persistence_delegate_factory_;
   raw_ptr<StrictMock<MockKeyRotationLauncher>> mock_launcher_;
 
   std::unique_ptr<DeviceTrustKeyManagerImpl> key_manager_;
@@ -120,23 +163,7 @@
 // Tests that StartInitialization will load a key and not trigger key creation
 // if key loading was successful.
 TEST_F(DeviceTrustKeyManagerImplTest, Initialization_WithPersistedKey) {
-  SetUpPersistedKey();
-
-  key_manager()->StartInitialization();
-
-  base::RunLoop run_loop;
-  key_manager()->ExportPublicKeyAsync(base::BindLambdaForTesting(
-      [&run_loop](absl::optional<std::string> value) {
-        EXPECT_TRUE(value);
-        EXPECT_FALSE(value->empty());
-        run_loop.Quit();
-      }));
-
-  run_loop.Run();
-
-  ExpectLoadedTpmKeyMetrics();
-  histogram_tester_.ExpectTotalCount(kKeyCreationResultHistogram, 0);
-  histogram_tester_.ExpectTotalCount(kKeyRotationResultHistogram, 0);
+  InitializeWithKey();
 }
 
 // Tests that:
@@ -398,4 +425,281 @@
   ExpectKeyCreatedMetrics();
 }
 
+// Tests that a properly initialized key manager handles a successful rotate key
+// request properly.
+TEST_F(DeviceTrustKeyManagerImplTest, RotateKey_Simple_Success) {
+  // A key already exists and the manager already loaded it.
+  InitializeWithKey();
+
+  KeyRotationCommand::Callback rotation_callback;
+  base::RunLoop rotate_key_loop;
+  EXPECT_CALL(*mock_launcher(), LaunchKeyRotation(kFakeNonce, _))
+      .WillOnce(Invoke(
+          [&](const std::string& nonce, KeyRotationCommand::Callback callback) {
+            rotation_callback = std::move(callback);
+            rotate_key_loop.Quit();
+          }));
+
+  key_manager()->StartKeyRotation(kFakeNonce);
+
+  rotate_key_loop.Run();
+
+  // Make the key rotation return a successful status and fake that a key is
+  // loadable.
+  SetUpPersistedKey();
+  ASSERT_FALSE(rotation_callback.is_null());
+  std::move(rotation_callback).Run(KeyRotationCommand::Status::SUCCEEDED);
+  RunUntilIdle();
+
+  // The key manager should now be properly setup.
+  ExpectManagerHandlesRequests();
+  ExpectSuccessKeyRotateMetrics();
+
+  // The manager should have loaded a total of two keys.
+  ExpectLoadedTpmKeyMetrics(/*times_loaded=*/2);
+}
+
+// Tests that a properly initialized key manager handles a failing rotate key
+// request properly.
+TEST_F(DeviceTrustKeyManagerImplTest, RotateKey_Simple_Failed) {
+  // A key already exists and the manager already loaded it.
+  InitializeWithKey();
+
+  KeyRotationCommand::Callback rotation_callback;
+  base::RunLoop rotate_key_loop;
+  EXPECT_CALL(*mock_launcher(), LaunchKeyRotation(kFakeNonce, _))
+      .WillOnce(Invoke(
+          [&](const std::string& nonce, KeyRotationCommand::Callback callback) {
+            rotation_callback = std::move(callback);
+            rotate_key_loop.Quit();
+          }));
+
+  key_manager()->StartKeyRotation(kFakeNonce);
+
+  rotate_key_loop.Run();
+
+  // Make the key rotation return a failed status.
+  ASSERT_FALSE(rotation_callback.is_null());
+  std::move(rotation_callback).Run(KeyRotationCommand::Status::FAILED);
+  RunUntilIdle();
+
+  // The key manager should still be properly setup.
+  ExpectManagerHandlesRequests();
+  ExpectFailedKeyRotateMetrics();
+
+  // The manager should have loaded a total of one key, the initial one.
+  ExpectLoadedTpmKeyMetrics(/*times_loaded=*/1);
+}
+
+// Tests that a properly initialized key manager handles concurrent successful
+// rotate key request properly.
+TEST_F(DeviceTrustKeyManagerImplTest, RotateKey_Concurrent_Success) {
+  // A key already exists and the manager already loaded it.
+  InitializeWithKey();
+
+  KeyRotationCommand::Callback first_rotation_callback;
+  base::RunLoop first_rotate_key_loop;
+  EXPECT_CALL(*mock_launcher(), LaunchKeyRotation(kFakeNonce, _))
+      .WillOnce(Invoke(
+          [&](const std::string& nonce, KeyRotationCommand::Callback callback) {
+            first_rotation_callback = std::move(callback);
+            first_rotate_key_loop.Quit();
+          }));
+
+  // Kick off the concurrent rotation requests.
+  key_manager()->StartKeyRotation(kFakeNonce);
+  key_manager()->StartKeyRotation(kOtherFakeNonce);
+
+  first_rotate_key_loop.Run();
+
+  KeyRotationCommand::Callback second_rotation_callback;
+  base::RunLoop second_rotate_key_loop;
+  EXPECT_CALL(*mock_launcher(), LaunchKeyRotation(kOtherFakeNonce, _))
+      .WillOnce(Invoke(
+          [&](const std::string& nonce, KeyRotationCommand::Callback callback) {
+            second_rotation_callback = std::move(callback);
+            second_rotate_key_loop.Quit();
+          }));
+
+  // Make the key rotation return a successful status and fake that a
+  // key again loadable.
+  SetUpPersistedKey();
+  ASSERT_FALSE(first_rotation_callback.is_null());
+  std::move(first_rotation_callback).Run(KeyRotationCommand::Status::SUCCEEDED);
+
+  RunUntilIdle();
+
+  second_rotate_key_loop.Run();
+
+  // Make the second key rotation return a successful status and fake that a
+  // key again loadable.
+  SetUpPersistedKey();
+  ASSERT_FALSE(second_rotation_callback.is_null());
+  std::move(second_rotation_callback)
+      .Run(KeyRotationCommand::Status::SUCCEEDED);
+  RunUntilIdle();
+
+  // The key manager should still be properly setup.
+  ExpectManagerHandlesRequests();
+  ExpectSuccessKeyRotateMetrics(/*times_rotated=*/2);
+
+  // The manager should have loaded a total of three keys.
+  ExpectLoadedTpmKeyMetrics(/*times_loaded=*/3);
+}
+
+// Tests that a properly initialized key manager handles concurrent rotate key
+// request properly when the second one fails.
+TEST_F(DeviceTrustKeyManagerImplTest, RotateKey_Concurrent_SuccessThenFail) {
+  // A key already exists and the manager already loaded it.
+  InitializeWithKey();
+
+  KeyRotationCommand::Callback first_rotation_callback;
+  base::RunLoop first_rotate_key_loop;
+  EXPECT_CALL(*mock_launcher(), LaunchKeyRotation(kFakeNonce, _))
+      .WillOnce(Invoke(
+          [&](const std::string& nonce, KeyRotationCommand::Callback callback) {
+            first_rotation_callback = std::move(callback);
+            first_rotate_key_loop.Quit();
+          }));
+
+  // Kick off the concurrent rotation requests.
+  key_manager()->StartKeyRotation(kFakeNonce);
+  key_manager()->StartKeyRotation(kOtherFakeNonce);
+
+  first_rotate_key_loop.Run();
+
+  KeyRotationCommand::Callback second_rotation_callback;
+  base::RunLoop second_rotate_key_loop;
+  EXPECT_CALL(*mock_launcher(), LaunchKeyRotation(kOtherFakeNonce, _))
+      .WillOnce(Invoke(
+          [&](const std::string& nonce, KeyRotationCommand::Callback callback) {
+            second_rotation_callback = std::move(callback);
+            second_rotate_key_loop.Quit();
+          }));
+
+  // Make the key rotation return a successful status and fake that a key is
+  // loadable.
+  SetUpPersistedKey();
+  ASSERT_FALSE(first_rotation_callback.is_null());
+  std::move(first_rotation_callback).Run(KeyRotationCommand::Status::SUCCEEDED);
+  RunUntilIdle();
+
+  second_rotate_key_loop.Run();
+
+  // Make the second key rotation return a failed status.
+  ASSERT_FALSE(second_rotation_callback.is_null());
+  std::move(second_rotation_callback).Run(KeyRotationCommand::Status::FAILED);
+  RunUntilIdle();
+
+  // The key manager should still be properly setup.
+  ExpectManagerHandlesRequests();
+  histogram_tester_.ExpectBucketCount(kKeyRotationResultHistogram,
+                                      DTKeyRotationResult::kSucceeded, 1);
+  histogram_tester_.ExpectBucketCount(kKeyRotationResultHistogram,
+                                      DTKeyRotationResult::kFailed, 1);
+  histogram_tester_.ExpectTotalCount(kKeyRotationResultHistogram, 2);
+  histogram_tester_.ExpectTotalCount(kKeyCreationResultHistogram, 0);
+
+  // The manager should have loaded a total of two keys.
+  ExpectLoadedTpmKeyMetrics(/*times_loaded=*/2);
+}
+
+// Tests that a properly initialized key manager handles a successful rotate key
+// request properly when it receives it while already loading a key.
+TEST_F(DeviceTrustKeyManagerImplTest, RotateKey_AtLoadKey_Success) {
+  KeyRotationCommand::Callback rotation_callback;
+  base::RunLoop rotate_key_loop;
+  EXPECT_CALL(*mock_launcher(), LaunchKeyRotation(kFakeNonce, _))
+      .WillOnce(Invoke(
+          [&](const std::string& nonce, KeyRotationCommand::Callback callback) {
+            rotation_callback = std::move(callback);
+            rotate_key_loop.Quit();
+          }));
+
+  // Binding the rotate request to the main thread, as the sequence checker will
+  // be expecting that.
+  base::RepeatingClosure start_rotate = base::BindPostTask(
+      base::SequencedTaskRunnerHandle::Get(), base::BindLambdaForTesting([&]() {
+        key_manager()->StartKeyRotation(kFakeNonce);
+      }));
+
+  // Setup so that a key is loadable, but a rotate request is received at the
+  // same time as it is being loaded.
+  auto mock_persistence_delegate =
+      persistence_delegate_factory_
+          .CreateMockedTpmDelegateWithLoadingSideEffect(start_rotate);
+  EXPECT_CALL(*mock_persistence_delegate, GetTpmBackedKeyProvider());
+  EXPECT_CALL(*mock_persistence_delegate, LoadKeyPair());
+
+  persistence_delegate_factory_.set_next_instance(
+      std::move(mock_persistence_delegate));
+
+  // Starting initialization will start loading the key.
+  key_manager()->StartInitialization();
+
+  rotate_key_loop.Run();
+
+  // Make the key rotation return a successful status and fake that a key is
+  // loadable.
+  SetUpPersistedKey();
+  ASSERT_FALSE(rotation_callback.is_null());
+  std::move(rotation_callback).Run(KeyRotationCommand::Status::SUCCEEDED);
+  RunUntilIdle();
+
+  // The key manager should now be properly setup.
+  ExpectManagerHandlesRequests();
+  ExpectSuccessKeyRotateMetrics();
+
+  // The manager should have loaded a total of two keys.
+  ExpectLoadedTpmKeyMetrics(/*times_loaded=*/2);
+}
+
+// Tests that a properly initialized key manager handles a failed rotate key
+// request properly when it receives it while already loading a key.
+TEST_F(DeviceTrustKeyManagerImplTest, RotateKey_AtLoadKey_Fails) {
+  KeyRotationCommand::Callback rotation_callback;
+  base::RunLoop rotate_key_loop;
+  EXPECT_CALL(*mock_launcher(), LaunchKeyRotation(kFakeNonce, _))
+      .WillOnce(Invoke(
+          [&](const std::string& nonce, KeyRotationCommand::Callback callback) {
+            rotation_callback = std::move(callback);
+            rotate_key_loop.Quit();
+          }));
+
+  // Binding the rotate request to the main thread, as the sequence checker will
+  // be expecting that.
+  base::RepeatingClosure start_rotate = base::BindPostTask(
+      base::SequencedTaskRunnerHandle::Get(), base::BindLambdaForTesting([&]() {
+        key_manager()->StartKeyRotation(kFakeNonce);
+      }));
+
+  // Setup so that a key is loadable, but a rotate request is received at the
+  // same time as it is being loaded.
+  auto mock_persistence_delegate =
+      persistence_delegate_factory_
+          .CreateMockedTpmDelegateWithLoadingSideEffect(start_rotate);
+  EXPECT_CALL(*mock_persistence_delegate, GetTpmBackedKeyProvider());
+  EXPECT_CALL(*mock_persistence_delegate, LoadKeyPair());
+
+  persistence_delegate_factory_.set_next_instance(
+      std::move(mock_persistence_delegate));
+
+  // Starting initialization will start loading the key.
+  key_manager()->StartInitialization();
+
+  rotate_key_loop.Run();
+
+  // Make the key rotation return a failed status.
+  ASSERT_FALSE(rotation_callback.is_null());
+  std::move(rotation_callback).Run(KeyRotationCommand::Status::FAILED);
+  RunUntilIdle();
+
+  // The key manager should still be properly setup (using the old key).
+  ExpectManagerHandlesRequests();
+  ExpectFailedKeyRotateMetrics();
+
+  // The manager should have loaded a total of one key.
+  ExpectLoadedTpmKeyMetrics(/*times_loaded=*/1);
+}
+
 }  // namespace enterprise_connectors

chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/scoped_key_persistence_delegate_factory.cc

diff --git a/chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/scoped_key_persistence_delegate_factory.cc b/chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/scoped_key_persistence_delegate_factory.cc
index b210a11..5c0f938 100644
--- a/chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/scoped_key_persistence_delegate_factory.cc
+++ b/chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/scoped_key_persistence_delegate_factory.cc
@@ -48,14 +48,23 @@
 
 std::unique_ptr<MockKeyPersistenceDelegate>
 ScopedKeyPersistenceDelegateFactory::CreateMockedTpmDelegate() {
+  return CreateMockedTpmDelegateWithLoadingSideEffect(do_nothing_);
+}
+
+std::unique_ptr<MockKeyPersistenceDelegate>
+ScopedKeyPersistenceDelegateFactory::
+    CreateMockedTpmDelegateWithLoadingSideEffect(
+        base::RepeatingClosure& side_effect) {
   if (tpm_wrapped_key_.empty()) {
     tpm_wrapped_key_ = GenerateTpmWrapped();
   }
 
   auto mocked_delegate = std::make_unique<MockKeyPersistenceDelegate>();
   ON_CALL(*mocked_delegate.get(), LoadKeyPair)
-      .WillByDefault(testing::Return(KeyPersistenceDelegate::KeyInfo(
-          BPKUR::CHROME_BROWSER_TPM_KEY, tpm_wrapped_key_)));
+      .WillByDefault(testing::DoAll(
+          testing::Invoke([&side_effect]() { side_effect.Run(); }),
+          testing::Return(KeyPersistenceDelegate::KeyInfo(
+              BPKUR::CHROME_BROWSER_TPM_KEY, tpm_wrapped_key_))));
   ON_CALL(*mocked_delegate.get(), GetTpmBackedKeyProvider)
       .WillByDefault(testing::Invoke([]() {
         // This is mocked via crypto::ScopedMockUnexportableKeyProvider.

chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/scoped_key_persistence_delegate_factory.h

diff --git a/chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/scoped_key_persistence_delegate_factory.h b/chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/scoped_key_persistence_delegate_factory.h
index 42fb64a..d56ca3e 100644
--- a/chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/scoped_key_persistence_delegate_factory.h
+++ b/chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/scoped_key_persistence_delegate_factory.h
@@ -9,6 +9,8 @@
 
 #include <vector>
 
+#include "base/callback_forward.h"
+#include "base/callback_helpers.h"
 #include "chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/key_persistence_delegate.h"
 #include "chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/key_persistence_delegate_factory.h"
 #include "crypto/scoped_mock_unexportable_key_provider.h"
@@ -33,6 +35,13 @@
   // persistence delegate (with a provider and valid key).
   std::unique_ptr<MockKeyPersistenceDelegate> CreateMockedTpmDelegate();
 
+  // Returns a mocked instance which is already setup to mimic a TPM-backed
+  // persistence delegate (with a provider and valid key). The mock will invoke
+  // `side_effect` before returning the key value in LoadKeyPair.
+  std::unique_ptr<MockKeyPersistenceDelegate>
+  CreateMockedTpmDelegateWithLoadingSideEffect(
+      base::RepeatingClosure& side_effect);
+
   // Returns a mocked instance which is already setup to mimic an EC-backed
   // persistence delegate (with a provider and valid key).
   std::unique_ptr<MockKeyPersistenceDelegate> CreateMockedECDelegate();
@@ -55,6 +64,8 @@
   std::vector<uint8_t> tpm_wrapped_key_;
   std::vector<uint8_t> ec_wrapped_key_;
 
+  base::RepeatingClosure do_nothing_ = base::DoNothing();
+
   // Next instance to be returned by `CreateKeyPersistenceDelegate`. Typically
   // set by tests to mock a persistence delegate fetched statically.
   std::unique_ptr<KeyPersistenceDelegate> next_instance_;

chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/win_key_persistence_delegate.cc

diff --git a/chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/win_key_persistence_delegate.cc b/chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/win_key_persistence_delegate.cc
index f0dd5a1..ea763ea 100644
--- a/chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/win_key_persistence_delegate.cc
+++ b/chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/win_key_persistence_delegate.cc
@@ -26,6 +26,12 @@
   if (!key.Valid())
     return false;
 
+  if (trust_level == BPKUR::KEY_TRUST_LEVEL_UNSPECIFIED) {
+    DCHECK_EQ(wrapped.size(), 0u);
+    return key.DeleteValue(signingkey_name.c_str()) == ERROR_SUCCESS &&
+           key.DeleteValue(trustlevel_name.c_str()) == ERROR_SUCCESS;
+  }
+
   return key.WriteValue(signingkey_name.c_str(), wrapped.data(), wrapped.size(),
                         REG_BINARY) == ERROR_SUCCESS &&
          key.WriteValue(trustlevel_name.c_str(), trust_level) == ERROR_SUCCESS;

chrome/browser/enterprise/connectors/device_trust/key_management/installer/key_rotation_manager_impl.cc

diff --git a/chrome/browser/enterprise/connectors/device_trust/key_management/installer/key_rotation_manager_impl.cc b/chrome/browser/enterprise/connectors/device_trust/key_management/installer/key_rotation_manager_impl.cc
index 231a165..24c7977 100644
--- a/chrome/browser/enterprise/connectors/device_trust/key_management/installer/key_rotation_manager_impl.cc
+++ b/chrome/browser/enterprise/connectors/device_trust/key_management/installer/key_rotation_manager_impl.cc
@@ -155,6 +155,10 @@
     if (key_pair_ && key_pair_->key()) {
       able_to_restore = persistence_delegate_->StoreKeyPair(
           key_pair_->trust_level(), key_pair_->key()->GetWrappedKey());
+    } else {
+      // If there was no old key we clear the registry.
+      able_to_restore = persistence_delegate_->StoreKeyPair(
+          BPKUR::KEY_TRUST_LEVEL_UNSPECIFIED, std::vector<uint8_t>());
     }
 
     RotationStatus status =

chrome/browser/enterprise/connectors/device_trust/key_management/installer/key_rotation_manager_unittest.cc

diff --git a/chrome/browser/enterprise/connectors/device_trust/key_management/installer/key_rotation_manager_unittest.cc b/chrome/browser/enterprise/connectors/device_trust/key_management/installer/key_rotation_manager_unittest.cc
index a9b960f..856c0e9a 100644
--- a/chrome/browser/enterprise/connectors/device_trust/key_management/installer/key_rotation_manager_unittest.cc
+++ b/chrome/browser/enterprise/connectors/device_trust/key_management/installer/key_rotation_manager_unittest.cc
@@ -201,6 +201,157 @@
       "Enterprise.DeviceTrust.RotateSigningKey.Tries", 1, 1);
 }
 
+// Tests a failed key rotation flow when a TPM key provider is available
+// and no key previously existed and the network request permanetly failed.
+// Also, in this case the registry should be cleared.
+TEST_P(KeyRotationManagerTest,
+       RotateWithAdminRights_Tpm_WithoutKey_NetworkFails_ClearRegistry) {
+  base::HistogramTester histogram_tester;
+
+  // The factory creates instances backed by fake TPM keys.
+  auto mock_persistence_delegate = scoped_factory_.CreateMockedTpmDelegate();
+
+  InSequence s;
+
+  // The mocked delegate is already set-up to return a working TPM key and
+  // provider. Force it to not return a key.
+  EXPECT_CALL(*mock_persistence_delegate, LoadKeyPair())
+      .WillOnce(Return(CreateEmptyKeyPair()));
+
+  EXPECT_CALL(*mock_persistence_delegate, GetTpmBackedKeyProvider());
+  EXPECT_CALL(*mock_persistence_delegate,
+              StoreKeyPair(BPKUR::CHROME_BROWSER_TPM_KEY, _))
+      .WillOnce(Return(true));
+
+  GURL dm_server_url(kDmServerUrl);
+  auto mock_network_delegate = std::make_unique<MockKeyNetworkDelegate>();
+  EXPECT_CALL(*mock_network_delegate,
+              SendPublicKeyToDmServerSync(dm_server_url, kDmToken, _))
+      .WillOnce(Return(CreateResponse(BPKUP::INVALID_SIGNATURE)));
+
+  EXPECT_CALL(
+      *mock_persistence_delegate,
+      StoreKeyPair(BPKUR::KEY_TRUST_LEVEL_UNSPECIFIED, std::vector<uint8_t>()))
+      .WillOnce(Return(true));
+
+  auto manager = KeyRotationManager::CreateForTesting(
+      std::move(mock_network_delegate), std::move(mock_persistence_delegate));
+
+  EXPECT_FALSE(
+      manager->RotateWithAdminRights(dm_server_url, kDmToken, nonce()));
+
+  //   Should expect one failed attempt to rotate a key on first try.
+  histogram_tester.ExpectUniqueSample(
+      status_histogram_name(),
+      KeyRotationManager::RotationStatus::FAILURE_CANNOT_UPLOAD_KEY, 1);
+  histogram_tester.ExpectTotalCount(opposite_status_histogram_name(), 0);
+  histogram_tester.ExpectUniqueSample(
+      "Enterprise.DeviceTrust.RotateSigningKey.Tries", 1, 1);
+}
+
+// Tests a failed key rotation flow when a TPM key provider is available
+// and no key previously existed and the network request transiently
+// failed max before really failing. Also, in this case the
+// registry should be cleared.
+TEST_P(
+    KeyRotationManagerTest,
+    RotateWithAdminRights_Tpm_WithoutKey_ExhaustedNetworkFails_ClearRegistry) {
+  base::HistogramTester histogram_tester;
+
+  // The factory creates instances backed by fake TPM keys.
+  auto mock_persistence_delegate = scoped_factory_.CreateMockedTpmDelegate();
+
+  InSequence s;
+
+  // The mocked delegate is already set-up to return a working TPM key and
+  // provider. Force it to not return a key.
+  EXPECT_CALL(*mock_persistence_delegate, LoadKeyPair())
+      .WillOnce(Return(CreateEmptyKeyPair()));
+
+  EXPECT_CALL(*mock_persistence_delegate, GetTpmBackedKeyProvider());
+  EXPECT_CALL(*mock_persistence_delegate,
+              StoreKeyPair(BPKUR::CHROME_BROWSER_TPM_KEY, _))
+      .WillOnce(Return(true));
+
+  GURL dm_server_url(kDmServerUrl);
+  auto mock_network_delegate = std::make_unique<MockKeyNetworkDelegate>();
+  EXPECT_CALL(*mock_network_delegate,
+              SendPublicKeyToDmServerSync(dm_server_url, kDmToken, _))
+      .WillRepeatedly(Return(CreateResponse(BPKUP::UNDEFINED)));
+
+  EXPECT_CALL(
+      *mock_persistence_delegate,
+      StoreKeyPair(BPKUR::KEY_TRUST_LEVEL_UNSPECIFIED, std::vector<uint8_t>()))
+      .WillOnce(Return(true));
+
+  auto manager = KeyRotationManager::CreateForTesting(
+      std::move(mock_network_delegate), std::move(mock_persistence_delegate));
+
+  EXPECT_FALSE(
+      manager->RotateWithAdminRights(dm_server_url, kDmToken, nonce()));
+
+  // Should expect one failed attempt to rotate a key with max tries.
+  histogram_tester.ExpectUniqueSample(
+      status_histogram_name(),
+      KeyRotationManager::RotationStatus::
+          FAILURE_CANNOT_UPLOAD_KEY_TRIES_EXHAUSTED,
+      1);
+  histogram_tester.ExpectTotalCount(opposite_status_histogram_name(), 0);
+  histogram_tester.ExpectUniqueSample(
+      "Enterprise.DeviceTrust.RotateSigningKey.Tries", 10, 1);
+}
+
+// Tests a failed key rotation flow when a TPM key provider is available
+// and no key previously existed, and the network request transiently failed
+// twice before really failing. In this case clearing the key registry fails.
+TEST_P(KeyRotationManagerTest,
+       RotateWithAdminRights_Tpm_WithoutKey_NetworkFails_ClearRegistryFails) {
+  base::HistogramTester histogram_tester;
+
+  // The factory creates instances backed by fake TPM keys.
+  auto mock_persistence_delegate = scoped_factory_.CreateMockedTpmDelegate();
+
+  InSequence s;
+
+  // The mocked delegate is already set-up to return a working TPM key and
+  // provider. Force it to not return a key.
+  EXPECT_CALL(*mock_persistence_delegate, LoadKeyPair())
+      .WillOnce(Return(CreateEmptyKeyPair()));
+
+  EXPECT_CALL(*mock_persistence_delegate, GetTpmBackedKeyProvider());
+  EXPECT_CALL(*mock_persistence_delegate,
+              StoreKeyPair(BPKUR::CHROME_BROWSER_TPM_KEY, _))
+      .WillOnce(Return(true));
+
+  GURL dm_server_url(kDmServerUrl);
+  auto mock_network_delegate = std::make_unique<MockKeyNetworkDelegate>();
+  EXPECT_CALL(*mock_network_delegate,
+              SendPublicKeyToDmServerSync(dm_server_url, kDmToken, _))
+      .WillOnce(Return(CreateResponse(BPKUP::UNDEFINED)))
+      .WillOnce(Return(CreateResponse(BPKUP::INVALID_SIGNATURE)));
+
+  EXPECT_CALL(
+      *mock_persistence_delegate,
+      StoreKeyPair(BPKUR::KEY_TRUST_LEVEL_UNSPECIFIED, std::vector<uint8_t>()))
+      .WillOnce(Return(false));
+
+  auto manager = KeyRotationManager::CreateForTesting(
+      std::move(mock_network_delegate), std::move(mock_persistence_delegate));
+
+  EXPECT_FALSE(
+      manager->RotateWithAdminRights(dm_server_url, kDmToken, nonce()));
+
+  // Should expect one failed attempt to rotate a key with two tries.
+  histogram_tester.ExpectUniqueSample(
+      status_histogram_name(),
+      KeyRotationManager::RotationStatus::
+          FAILURE_CANNOT_UPLOAD_KEY_RESTORE_FAILED,
+      1);
+  histogram_tester.ExpectTotalCount(opposite_status_histogram_name(), 0);
+  histogram_tester.ExpectUniqueSample(
+      "Enterprise.DeviceTrust.RotateSigningKey.Tries", 2, 1);
+}
+
 // Tests a success key rotation flow when a TPM key provider is not available
 // and a key previously existed.
 TEST_P(KeyRotationManagerTest, RotateWithAdminRights_NoTpm_WithKey) {

chrome/browser/extensions/activity_log/counting_policy_unittest.cc

diff --git a/chrome/browser/extensions/activity_log/counting_policy_unittest.cc b/chrome/browser/extensions/activity_log/counting_policy_unittest.cc
index 4760526..0fbc4894 100644
--- a/chrome/browser/extensions/activity_log/counting_policy_unittest.cc
+++ b/chrome/browser/extensions/activity_log/counting_policy_unittest.cc
@@ -428,8 +428,8 @@
   extension_service_->AddExtension(extension.get());
 
   std::unique_ptr<base::ListValue> args(new base::ListValue());
-  args->Set(0, std::make_unique<base::Value>("hello"));
-  args->Set(1, std::make_unique<base::Value>("world"));
+  args->Append("hello");
+  args->Append("world");
   scoped_refptr<Action> action = new Action(extension->id(),
                                             base::Time::Now(),
                                             Action::ACTION_API_CALL,

chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc

diff --git a/chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc b/chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc
index b87901b..0bd7360 100644
--- a/chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc
+++ b/chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc
@@ -491,8 +491,8 @@
   extension_service_->AddExtension(extension.get());
 
   std::unique_ptr<base::ListValue> args(new base::ListValue());
-  args->Set(0, std::make_unique<base::Value>("hello"));
-  args->Set(1, std::make_unique<base::Value>("world"));
+  args->Append("hello");
+  args->Append("world");
   scoped_refptr<Action> action = new Action(extension->id(),
                                             base::Time::Now(),
                                             Action::ACTION_API_CALL,

chrome/browser/extensions/api/activity_log_private/activity_log_private_api_unittest.cc

diff --git a/chrome/browser/extensions/api/activity_log_private/activity_log_private_api_unittest.cc b/chrome/browser/extensions/api/activity_log_private/activity_log_private_api_unittest.cc
index e9b027c..51aebe6 100644
--- a/chrome/browser/extensions/api/activity_log_private/activity_log_private_api_unittest.cc
+++ b/chrome/browser/extensions/api/activity_log_private/activity_log_private_api_unittest.cc
@@ -29,8 +29,8 @@
 
 TEST_F(ActivityLogApiUnitTest, ConvertChromeApiAction) {
   std::unique_ptr<base::ListValue> args(new base::ListValue());
-  args->Set(0, std::make_unique<base::Value>("hello"));
-  args->Set(1, std::make_unique<base::Value>("world"));
+  args->Append("hello");
+  args->Append("world");
   scoped_refptr<Action> action(new Action(kExtensionId,
                                           base::Time::Now(),
                                           Action::ACTION_API_CALL,
@@ -47,8 +47,8 @@
 
 TEST_F(ActivityLogApiUnitTest, ConvertDomAction) {
   std::unique_ptr<base::ListValue> args(new base::ListValue());
-  args->Set(0, std::make_unique<base::Value>("hello"));
-  args->Set(1, std::make_unique<base::Value>("world"));
+  args->Append("hello");
+  args->Append("world");
   scoped_refptr<Action> action(new Action(kExtensionId,
                                base::Time::Now(),
                                Action::ACTION_DOM_ACCESS,

chrome/browser/extensions/api/declarative_net_request/declarative_net_request_apitest.cc

diff --git a/chrome/browser/extensions/api/declarative_net_request/declarative_net_request_apitest.cc b/chrome/browser/extensions/api/declarative_net_request/declarative_net_request_apitest.cc
index 9eef1fd..53d9523 100644
--- a/chrome/browser/extensions/api/declarative_net_request/declarative_net_request_apitest.cc
+++ b/chrome/browser/extensions/api/declarative_net_request/declarative_net_request_apitest.cc
@@ -134,7 +134,13 @@
   base::test::ScopedFeatureList feature_list_;
 };
 
-IN_PROC_BROWSER_TEST_P(DeclarativeNetRequestApiFencedFrameTest, Load) {
+// TODO(crbug.com/1278823): Flaky on Mac
+#if defined(OS_MAC)
+#define MAYBE_Load DISABLED_Load
+#else
+#define MAYBE_Load Load
+#endif
+IN_PROC_BROWSER_TEST_P(DeclarativeNetRequestApiFencedFrameTest, MAYBE_Load) {
   ASSERT_TRUE(RunExtensionTest("fenced_frames")) << message_;
 }
 

chrome/browser/extensions/api/omnibox/omnibox_api.cc

diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api.cc b/chrome/browser/extensions/api/omnibox/omnibox_api.cc
index 127ddf7d..84bcc31c 100644
--- a/chrome/browser/extensions/api/omnibox/omnibox_api.cc
+++ b/chrome/browser/extensions/api/omnibox/omnibox_api.cc
@@ -113,8 +113,8 @@
     return false;
 
   auto args(std::make_unique<base::ListValue>());
-  args->Set(0, std::make_unique<base::Value>(input));
-  args->Set(1, std::make_unique<base::Value>(suggest_id));
+  args->Append(input);
+  args->Append(suggest_id);
 
   auto event = std::make_unique<Event>(events::OMNIBOX_ON_INPUT_CHANGED,
                                        omnibox::OnInputChanged::kEventName,
@@ -140,13 +140,13 @@
       active_tab_permission_granter()->GrantIfRequested(extension);
 
   auto args(std::make_unique<base::ListValue>());
-  args->Set(0, std::make_unique<base::Value>(input));
+  args->Append(input);
   if (disposition == WindowOpenDisposition::NEW_FOREGROUND_TAB)
-    args->Set(1, std::make_unique<base::Value>(kForegroundTabDisposition));
+    args->Append(kForegroundTabDisposition);
   else if (disposition == WindowOpenDisposition::NEW_BACKGROUND_TAB)
-    args->Set(1, std::make_unique<base::Value>(kBackgroundTabDisposition));
+    args->Append(kBackgroundTabDisposition);
   else
-    args->Set(1, std::make_unique<base::Value>(kCurrentTabDisposition));
+    args->Append(kCurrentTabDisposition);
 
   auto event = std::make_unique<Event>(events::OMNIBOX_ON_INPUT_ENTERED,
                                        omnibox::OnInputEntered::kEventName,
@@ -172,7 +172,7 @@
     const std::string& extension_id,
     const std::string& suggestion_text) {
   auto args(std::make_unique<base::ListValue>());
-  args->Set(0, std::make_unique<base::Value>(suggestion_text));
+  args->Append(suggestion_text);
 
   auto event = std::make_unique<Event>(events::OMNIBOX_ON_DELETE_SUGGESTION,
                                        omnibox::OnDeleteSuggestion::kEventName,

chrome/browser/extensions/api/tabs/tabs_event_router.cc

diff --git a/chrome/browser/extensions/api/tabs/tabs_event_router.cc b/chrome/browser/extensions/api/tabs/tabs_event_router.cc
index fc41f87..1f15f2553 100644
--- a/chrome/browser/extensions/api/tabs/tabs_event_router.cc
+++ b/chrome/browser/extensions/api/tabs/tabs_event_router.cc
@@ -65,8 +65,8 @@
       changed_properties->SetKey(property, value->Clone());
   }
 
-  event->event_args->Set(1, std::move(changed_properties));
-  event->event_args->Set(2, std::move(tab_value));
+  event->event_args->Append(std::move(changed_properties));
+  event->event_args->Append(std::move(tab_value));
   return true;
 }
 

chrome/browser/feed/android/BUILD.gn

diff --git a/chrome/browser/feed/android/BUILD.gn b/chrome/browser/feed/android/BUILD.gn
index e07d2ad..84386fc3 100644
--- a/chrome/browser/feed/android/BUILD.gn
+++ b/chrome/browser/feed/android/BUILD.gn
@@ -161,10 +161,12 @@
     "java/res/color/menu_footer_chip_background.xml",
     "java/res/drawable-hdpi/follow_accelerator_shadow.9.png",
     "java/res/drawable-mdpi/follow_accelerator_shadow.9.png",
+    "java/res/drawable-v24/new_tab_page_multi_feed_header_background.xml",
     "java/res/drawable-xhdpi/follow_accelerator_shadow.9.png",
     "java/res/drawable-xxhdpi/follow_accelerator_shadow.9.png",
     "java/res/drawable/back_to_top_arrow.xml",
     "java/res/drawable/feed_header_border_background.xml",
+    "java/res/drawable/new_tab_page_multi_feed_header_background.xml",
     "java/res/drawable/rounded_corners.xml",
     "java/res/drawable/web_feed_post_follow_illustration.xml",
     "java/res/layout/back_to_top_bubble.xml",

chrome/browser/feed/android/java/res/drawable-v24/new_tab_page_multi_feed_header_background.xml

diff --git a/chrome/browser/feed/android/java/res/drawable-v24/new_tab_page_multi_feed_header_background.xml b/chrome/browser/feed/android/java/res/drawable-v24/new_tab_page_multi_feed_header_background.xml
new file mode 100644
index 0000000..174c425
--- /dev/null
+++ b/chrome/browser/feed/android/java/res/drawable-v24/new_tab_page_multi_feed_header_background.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2021 The Chromium Authors. All rights reserved.
+     Use of this source code is governed by a BSD-style license that can be
+     found in the LICENSE file. -->
+
+<org.chromium.components.browser_ui.widget.SurfaceColorDrawable
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:shape="rectangle"
+    app:surfaceElevation="@dimen/default_elevation_1"/>
\ No newline at end of file

chrome/browser/feed/android/java/res/drawable/new_tab_page_multi_feed_header_background.xml

diff --git a/chrome/browser/feed/android/java/res/drawable/new_tab_page_multi_feed_header_background.xml b/chrome/browser/feed/android/java/res/drawable/new_tab_page_multi_feed_header_background.xml
new file mode 100644
index 0000000..01a5512
--- /dev/null
+++ b/chrome/browser/feed/android/java/res/drawable/new_tab_page_multi_feed_header_background.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2021 The Chromium Authors. All rights reserved.
+     Use of this source code is governed by a BSD-style license that can be
+     found in the LICENSE file. -->
+
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+  <solid android:color="@color/default_bg_color_elev_1_baseline" />
+</shape>
\ No newline at end of file

chrome/browser/feed/android/java/res/layout/new_tab_page_multi_feed_header.xml

diff --git a/chrome/browser/feed/android/java/res/layout/new_tab_page_multi_feed_header.xml b/chrome/browser/feed/android/java/res/layout/new_tab_page_multi_feed_header.xml
index e444a98..aee0b838 100644
--- a/chrome/browser/feed/android/java/res/layout/new_tab_page_multi_feed_header.xml
+++ b/chrome/browser/feed/android/java/res/layout/new_tab_page_multi_feed_header.xml
@@ -71,7 +71,7 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:paddingHorizontal="@dimen/ntp_header_lateral_paddings_v2"
-      android:background="@color/default_bg_color_elev_1"
+      android:background="@drawable/new_tab_page_multi_feed_header_background"
       android:visibility="gone" />
 
 </org.chromium.chrome.browser.feed.sections.SectionHeaderView>

chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedSwipeRefreshLayout.java

diff --git a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedSwipeRefreshLayout.java b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedSwipeRefreshLayout.java
index 3077535..5109db3 100644
--- a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedSwipeRefreshLayout.java
+++ b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedSwipeRefreshLayout.java
@@ -21,6 +21,7 @@
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.user_education.IPHCommandBuilder;
 import org.chromium.chrome.browser.user_education.UserEducationHelper;
+import org.chromium.components.browser_ui.styles.ChromeColors;
 import org.chromium.components.browser_ui.styles.SemanticColorUtils;
 import org.chromium.components.feature_engagement.FeatureConstants;
 import org.chromium.third_party.android.swiperefresh.CircleImageView;
@@ -63,8 +64,8 @@
         FeedSwipeRefreshLayout instance = new FeedSwipeRefreshLayout(activity, anchorViewId);
         instance.setLayoutParams(
                 new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
-        instance.setProgressBackgroundColorSchemeResource(
-                org.chromium.ui.R.color.default_bg_color_elev_2);
+        instance.setProgressBackgroundColorSchemeColor(
+                ChromeColors.getSurfaceColor(activity, R.dimen.default_elevation_2));
         instance.setColorSchemeColors(SemanticColorUtils.getDefaultControlColorActive(activity));
         instance.setEnabled(false);
         final DisplayMetrics metrics = activity.getResources().getDisplayMetrics();

chrome/browser/first_run/upgrade_util_win.cc

diff --git a/chrome/browser/first_run/upgrade_util_win.cc b/chrome/browser/first_run/upgrade_util_win.cc
index b350a01..6cef0a4f 100644
--- a/chrome/browser/first_run/upgrade_util_win.cc
+++ b/chrome/browser/first_run/upgrade_util_win.cc
@@ -59,36 +59,54 @@
 
 bool InvokeGoogleUpdateForRename() {
 #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
+  // This has been identified as very slow on some startups. Detailed trace
+  // events below try to shine a light on each steps. crbug.com/1252004
   TRACE_EVENT0("startup", "upgrade_util::InvokeGoogleUpdateForRename");
 
   Microsoft::WRL::ComPtr<IProcessLauncher> ipl;
-  HRESULT hr = ::CoCreateInstance(__uuidof(ProcessLauncherClass), nullptr,
-                                  CLSCTX_ALL, IID_PPV_ARGS(&ipl));
-  if (FAILED(hr)) {
-    LOG(ERROR) << "CoCreate ProcessLauncherClass failed; hr = " << std::hex
-               << hr;
-    return false;
+  {
+    TRACE_EVENT0("startup", "InvokeGoogleUpdateForRename CoCreateInstance");
+    HRESULT hr = ::CoCreateInstance(__uuidof(ProcessLauncherClass), nullptr,
+                                    CLSCTX_ALL, IID_PPV_ARGS(&ipl));
+    if (FAILED(hr)) {
+      TRACE_EVENT0("startup",
+                   "InvokeGoogleUpdateForRename CoCreateInstance failed");
+      LOG(ERROR) << "CoCreate ProcessLauncherClass failed; hr = " << std::hex
+                 << hr;
+      return false;
+    }
   }
 
   ULONG_PTR process_handle;
-  hr = ipl->LaunchCmdElevated(install_static::GetAppGuid(),
-                              google_update::kRegRenameCmdField,
-                              ::GetCurrentProcessId(), &process_handle);
-  if (FAILED(hr)) {
-    LOG(ERROR) << "IProcessLauncher::LaunchCmdElevated failed; hr = "
-               << std::hex << hr;
-    return false;
+  {
+    TRACE_EVENT0("startup", "InvokeGoogleUpdateForRename LaunchCmdElevated");
+    HRESULT hr = ipl->LaunchCmdElevated(
+        install_static::GetAppGuid(),
+        google_update::kRegRenameCmdField,
+        ::GetCurrentProcessId(), &process_handle);
+    if (FAILED(hr)) {
+      TRACE_EVENT0("startup",
+                   "InvokeGoogleUpdateForRename LaunchCmdElevated failed");
+      LOG(ERROR) << "IProcessLauncher::LaunchCmdElevated failed; hr = "
+                 << std::hex << hr;
+      return false;
+    }
   }
 
   base::Process rename_process(
       reinterpret_cast<base::ProcessHandle>(process_handle));
   int exit_code;
-  if (!rename_process.WaitForExit(&exit_code)) {
-    PLOG(ERROR) << "WaitForExit of rename process failed";
-    return false;
+  {
+    TRACE_EVENT0("startup", "InvokeGoogleUpdateForRename WaitForExit");
+    if (!rename_process.WaitForExit(&exit_code)) {
+      TRACE_EVENT0("startup", "InvokeGoogleUpdateForRename WaitForExit failed");
+      PLOG(ERROR) << "WaitForExit of rename process failed";
+      return false;
+    }
   }
 
   if (exit_code != installer::RENAME_SUCCESSFUL) {
+    TRACE_EVENT0("startup", "InvokeGoogleUpdateForRename !RENAME_SUCCESSFUL");
     LOG(ERROR) << "Rename process failed with exit code " << exit_code;
     return false;
   }

chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc

diff --git a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
index 294de1c..86f5d07 100644
--- a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
+++ b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
@@ -618,19 +618,33 @@
 #endif  // BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)
   );
 
-  // BackupRefPtr_Effective and PCScan_Effective records whether or not
+  // BackupRefPtr_Effective and PCScan_Effective record whether or not
   // BackupRefPtr and/or PCScan are enabled. The experiments aren't independent,
   // so having a synthetic Finch will help look only at cases where one isn't
   // affected by the other.
 
 #if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)
+  // Whether PartitionAllocBackupRefPtr is enabled (as determined by
+  // FeatureList::IsEnabled).
   bool brp_finch_enabled = false;
   ALLOW_UNUSED_LOCAL(brp_finch_enabled);
+  // Whether PartitionAllocBackupRefPtr is set up for the default behavior. The
+  // default behavior is when either the Finch flag is disabled, or is enabled
+  // in brp-mode=disabled (these two options are equivalent).
+  bool brp_nondefault_behavior = false;
+  ALLOW_UNUSED_LOCAL(brp_nondefault_behavior);
+  // Whether PartitionAllocBackupRefPtr is set up to enable BRP protection. It
+  // requires the Finch flag to be enabled and brp-mode!=disabled*. Some modes,
+  // e.g. disabled-but-3-way-split, do something (hence can't be considered the
+  // default behavior), but don't enable BRP protection.
   bool brp_truly_enabled = false;
   ALLOW_UNUSED_LOCAL(brp_truly_enabled);
 #if BUILDFLAG(USE_BACKUP_REF_PTR)
   if (base::FeatureList::IsEnabled(base::features::kPartitionAllocBackupRefPtr))
     brp_finch_enabled = true;
+  if (brp_finch_enabled && base::features::kBackupRefPtrModeParam.Get() !=
+                               base::features::BackupRefPtrMode::kDisabled)
+    brp_nondefault_behavior = true;
   if (brp_finch_enabled && base::features::kBackupRefPtrModeParam.Get() ==
                                base::features::BackupRefPtrMode::kEnabled)
     brp_truly_enabled = true;
@@ -698,23 +712,35 @@
       "BackupRefPtr_Effective", brp_group_name);
 
   std::string pcscan_group_name;
+  std::string pcscan_group_name_fallback;
 #if defined(PA_ALLOW_PCSCAN)
   if (brp_truly_enabled) {
-    // If BRP is enabled, just ignore the population. Check brp_truly_enabled,
-    // not brp_finch_enabled, because there are certain modes where BRP is
-    // actually disabled.
+    // If BRP protection is enabled, just ignore the population. Check
+    // brp_truly_enabled, not brp_finch_enabled, because there are certain modes
+    // where BRP protection is actually disabled.
     pcscan_group_name = "Ignore_BRPIsOn";
   } else {
     pcscan_group_name = (pcscan_enabled ? "Enabled" : "Disabled");
   }
+  // In case we are incorrect that PCScan is independent of partition-split
+  // modes, create a fallback trial that only takes into account the BRP Finch
+  // settings that preserve the default behavior.
+  if (brp_nondefault_behavior) {
+    pcscan_group_name_fallback = "Ignore_BRPIsOn";
+  } else {
+    pcscan_group_name_fallback = (pcscan_enabled ? "Enabled" : "Disabled");
+  }
 #else
   // On certain platforms, PCScan is not supported and permanently disabled.
   // Don't lump it into "Disabled", so that belonging to "Enabled"/"Disabled" is
   // fully controlled by Finch and thus have identical population sizes.
   pcscan_group_name = "Unavailable";
+  pcscan_group_name_fallback = "Unavailable";
 #endif  // defined(PA_ALLOW_PCSCAN)
   ChromeMetricsServiceAccessor::RegisterSyntheticFieldTrial("PCScan_Effective",
                                                             pcscan_group_name);
+  ChromeMetricsServiceAccessor::RegisterSyntheticFieldTrial(
+      "PCScan_Effective_Fallback", pcscan_group_name_fallback);
 
   // This synthetic Finch setting reflects the new USE_BACKUP_REF_PTR behavior,
   // which simply compiles in the BackupRefPtr support, but keeps it disabled at

chrome/browser/metrics/process_memory_metrics_emitter.cc

diff --git a/chrome/browser/metrics/process_memory_metrics_emitter.cc b/chrome/browser/metrics/process_memory_metrics_emitter.cc
index a73df77..98eb64a 100644
--- a/chrome/browser/metrics/process_memory_metrics_emitter.cc
+++ b/chrome/browser/metrics/process_memory_metrics_emitter.cc
@@ -687,7 +687,7 @@
                               pmd.os_dump().private_footprint_kb / kKiB);
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   if (process_type == HistogramProcessType::kBrowser && profile_manager &&
-      profile_manager->HasZombieProfile()) {
+      profile_manager->GetZombieProfileCount() > 0) {
     // Measure impact of the DestroyProfileOnBrowserClose experiment.
     MEMORY_METRICS_HISTOGRAM_MB(
         GetPrivateFootprintHistogramName(process_type) + ".HasZombieProfile",
@@ -1117,7 +1117,7 @@
     UMA_HISTOGRAM_MEMORY_LARGE_MB("Memory.Total.PrivateMemoryFootprint",
                                   private_footprint_total_kb / kKiB);
     ProfileManager* profile_manager = g_browser_process->profile_manager();
-    if (profile_manager && profile_manager->HasZombieProfile()) {
+    if (profile_manager && profile_manager->GetZombieProfileCount() > 0) {
       // Measure impact of the DestroyProfileOnBrowserClose experiment.
       UMA_HISTOGRAM_MEMORY_LARGE_MB(
           "Memory.Total.PrivateMemoryFootprint.HasZombieProfile",

chrome/browser/profiles/profile_manager.cc

diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc
index feacaf4..e63d041 100644
--- a/chrome/browser/profiles/profile_manager.cc
+++ b/chrome/browser/profiles/profile_manager.cc
@@ -498,6 +498,9 @@
 
   if (ProfileShortcutManager::IsFeatureEnabled() && !user_data_dir_.empty())
     profile_shortcut_manager_ = ProfileShortcutManager::Create(this);
+
+  zombie_metrics_timer_.Start(FROM_HERE, base::Minutes(30), this,
+                              &ProfileManager::RecordZombieMetrics);
 }
 
 ProfileManager::~ProfileManager() {
@@ -1389,13 +1392,25 @@
   return info->keep_alives[origin] > 0;
 }
 
-bool ProfileManager::HasZombieProfile() const {
+void ProfileManager::DisableProfileMetricsForTesting() {
+  zombie_metrics_timer_.Stop();
+}
+
+size_t ProfileManager::GetZombieProfileCount() const {
+  size_t zombie_count = 0;
   for (const base::FilePath& dir : ever_loaded_profiles_) {
     const ProfileInfo* info = GetProfileInfoByPath(dir);
     if (!info || GetTotalRefCount(info->keep_alives) == 0)
-      return true;
+      zombie_count++;
   }
-  return false;
+  return zombie_count;
+}
+
+void ProfileManager::RecordZombieMetrics() {
+  size_t zombie_count = GetZombieProfileCount();
+  base::UmaHistogramCounts100("Profile.LiveProfileCount",
+                              ever_loaded_profiles_.size() - zombie_count);
+  base::UmaHistogramCounts100("Profile.ZombieProfileCount", zombie_count);
 }
 
 void ProfileManager::AddKeepAlive(const Profile* profile,

chrome/browser/profiles/profile_manager.h

diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles/profile_manager.h
index 35bc427..32096da 100644
--- a/chrome/browser/profiles/profile_manager.h
+++ b/chrome/browser/profiles/profile_manager.h
@@ -23,6 +23,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/threading/thread_checker.h"
+#include "base/timer/timer.h"
 #include "build/build_config.h"
 #include "build/chromeos_buildflags.h"
 #include "chrome/browser/profiles/profile.h"
@@ -286,8 +287,11 @@
   bool HasKeepAliveForTesting(const Profile* profile,
                               ProfileKeepAliveOrigin origin);
 
-  // Returns true if there's at least one profile in a "zombie" state, which
-  // means either:
+  // Disables the periodic reporting of profile metrics, as this is causing
+  // tests to time out.
+  void DisableProfileMetricsForTesting();
+
+  // Returns the number of profiles in a "zombie" state, which means either:
   //
   //   - this profile was destroyed from memory,
   //   - this profile has a refcount of 0, meaning it's safe to destroy.
@@ -298,7 +302,7 @@
   //
   // This is used for an A/B test, that measures the impact of the
   // DestroyProfileOnBrowserClose variation on memory usage.
-  bool HasZombieProfile() const;
+  size_t GetZombieProfileCount() const;
 
  protected:
   // Creates a new profile by calling into the profile's profile creation
@@ -386,8 +390,11 @@
   void AddKeepAlive(const Profile* profile, ProfileKeepAliveOrigin origin);
   void RemoveKeepAlive(const Profile* profile, ProfileKeepAliveOrigin origin);
 
-  // Removes the kWaitingForFirstBrowserWindow keepalive. This allows a Profile*
-  // to be deleted from now on, even if it never had a visible browser window.
+  void RecordZombieMetrics();
+
+  // Removes the kWaitingForFirstBrowserWindow keepalive. This allows a
+  // Profile* to be deleted from now on, even if it never had a visible
+  // browser window.
   void ClearFirstBrowserWindowKeepAlive(const Profile* profile);
 
   // Helper for RemoveKeepAlive() and ClearFirstBrowserWindowFlag(). If the
@@ -584,6 +591,10 @@
   // from DestroyProfileOnBrowserClose.
   std::set<base::FilePath> ever_loaded_profiles_;
 
+  // Runs a task every 30 minutes to record the number of zombie & non-zombie
+  // profiles in memory.
+  base::RepeatingTimer zombie_metrics_timer_;
+
   // Controls whether to initialize some services. Only disabled for testing.
   bool do_final_services_init_ = true;
 

chrome/browser/resources/access_code_cast/access_code_cast.html

diff --git a/chrome/browser/resources/access_code_cast/access_code_cast.html b/chrome/browser/resources/access_code_cast/access_code_cast.html
index 6aed44b2..73d967a 100644
--- a/chrome/browser/resources/access_code_cast/access_code_cast.html
+++ b/chrome/browser/resources/access_code_cast/access_code_cast.html
@@ -31,8 +31,8 @@
 </div>
 <div id="button-container">
   <cr-button on-click="close">$i18n{close}</cr-button>
-  <cr-button id="castButton" class="action-button"
-    disabled="[[castButtonDisabled]]">
+  <cr-button id="castButton" on-click="addSinkAndCast" class="action-button"
+    disabled="[[castButtonDisabled(accessCode)]]">
     $i18n{cast}
   </cr-button>
   <cr-button id="backButton" on-click="switchToCodeInput"

chrome/browser/resources/access_code_cast/access_code_cast.ts

diff --git a/chrome/browser/resources/access_code_cast/access_code_cast.ts b/chrome/browser/resources/access_code_cast/access_code_cast.ts
index e052ab34..686fed3a 100644
--- a/chrome/browser/resources/access_code_cast/access_code_cast.ts
+++ b/chrome/browser/resources/access_code_cast/access_code_cast.ts
@@ -12,9 +12,11 @@
 import {CrButtonElement} from 'chrome://resources/cr_elements/cr_button/cr_button.m.js';
 import {html, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
-import {PageCallbackRouter} from './access_code_cast.mojom-webui.js';
+
+import {AddSinkResultCode, CastDiscoveryMethod, PageCallbackRouter} from './access_code_cast.mojom-webui.js';
 import {BrowserProxy} from './browser_proxy.js';
 import {CodeInputElement} from './code_input/code_input.js';
+import {RouteRequestResultCode} from './route_request_result_code.mojom-webui.js';
 
 declare const chrome: any;
 
@@ -45,16 +47,16 @@
   private listenerIds: Array<number>;
   private router: PageCallbackRouter;
 
-  codeLength: number;
-  castButtonDisabled: boolean;
+  private static readonly ACCESS_CODE_LENGTH = 6;
+  private accessCode: string;
+  private state: PageState;
 
   constructor() {
     super();
     this.listenerIds = [];
     this.router = BrowserProxy.getInstance().callbackRouter;
 
-    this.codeLength = 6;
-    this.castButtonDisabled = true;
+    this.accessCode = '';
   }
 
   ready() {
@@ -86,7 +88,48 @@
     this.setState(PageState.QR_INPUT);
   }
 
+  async addSinkAndCast() {
+    if (this.accessCode.length !== AccessCodeCastElement.ACCESS_CODE_LENGTH) {
+      return;
+    }
+
+    const method = this.state === PageState.CODE_INPUT ? 
+      CastDiscoveryMethod.INPUT_ACCESS_CODE : CastDiscoveryMethod.QR_CODE;
+
+    const addResult = await this.addSink(method).catch(() => {
+      return AddSinkResultCode.UNKNOWN_ERROR;
+    });
+
+    if (addResult !== AddSinkResultCode.OK) {
+      this.showAddSinkError(addResult);
+      return;
+    }
+
+    const castResult = await this.cast().catch(() => {
+      return RouteRequestResultCode.UNKNOWN_ERROR;
+    });
+
+    if (castResult !== RouteRequestResultCode.OK) {
+      this.showCastError(castResult);
+      return;
+    }
+
+    this.close();
+  }
+
+  // Even though we can get this.accessCode directly, passing it triggers
+  // Polymer's data binding whenever this.accessCode updates.
+  castButtonDisabled(accessCode: string) {
+    return accessCode.length !== AccessCodeCastElement.ACCESS_CODE_LENGTH;
+  }
+
+  setAccessCodeForTest(value: string) {
+    this.accessCode = value;
+  }
+
   private setState(state: PageState) {
+    this.state = state;
+
     this.$.codeInputView.hidden = state !== PageState.CODE_INPUT;
     this.$.castButton.hidden = state !== PageState.CODE_INPUT;
     this.$.qrInputView.hidden = state !== PageState.QR_INPUT;
@@ -99,8 +142,39 @@
   }
 
   private handleCodeInput(e: any) {
-    this.castButtonDisabled = e.detail.value.length !== this.codeLength;
+    this.accessCode = e.detail.value;
   }
+
+  private async addSink(method: CastDiscoveryMethod):
+      Promise<AddSinkResultCode> {
+    const addSinkResult = await BrowserProxy.getInstance().handler
+        .addSink(this.accessCode, method);
+    return addSinkResult.resultCode as AddSinkResultCode;
+  }
+
+  private async cast(): Promise<RouteRequestResultCode> {
+    const castResult = await BrowserProxy.getInstance().handler.castToSink();
+    return castResult.resultCode as RouteRequestResultCode;
+  }
+
+  // TODO:(b/209720173): Implement this functions to handle errors
+  private showAddSinkError(resultCode: AddSinkResultCode) {
+    if (resultCode === AddSinkResultCode.INVALID_ACCESS_CODE) {
+      console.log('Incorrect access code');
+    } else {
+      console.log('Add sink error: ' + resultCode);
+    }
+  }
+
+  // TODO:(b/209720173): Implement this functions to handle errors
+  private showCastError(resultCode: RouteRequestResultCode) {
+    if (resultCode === RouteRequestResultCode.ROUTE_NOT_FOUND) {
+      console.log('Route not found');
+    } else {
+      console.log('Cast error: ' + resultCode);
+    }
+  }
+
 }
 
 customElements.define(AccessCodeCastElement.is, AccessCodeCastElement);

chrome/browser/resources/settings/chromeos/device_page/pointers.html

diff --git a/chrome/browser/resources/settings/chromeos/device_page/pointers.html b/chrome/browser/resources/settings/chromeos/device_page/pointers.html
index 784760cb..48cb948e 100644
--- a/chrome/browser/resources/settings/chromeos/device_page/pointers.html
+++ b/chrome/browser/resources/settings/chromeos/device_page/pointers.html
@@ -207,16 +207,13 @@
         </div>
       </template>
       <template is="dom-if" if="[[allowTouchpadHapticFeedback_]]">
-        <div class="settings-box" id="touchpadHapticFeedbackRow"
+        <div class="settings-box two-line" id="touchpadHapticFeedbackRow"
             on-click="onTouchpadHapticFeedbackRowClicked_">
           <div class="start settings-box-text">
-            <!--TODO(gavinwill): Add haptic feedback help link URL.-->
-            <localized-link
-                on-click="onLearnMoreLinkClicked_"
-                id="touchpadHapticFeedbackLabel"
-                localized-string="$i18n{touchpadHapticFeedbackLabel}"
-                link-url="#">
-            </localized-link>
+            <div>$i18n{touchpadHapticFeedbackTitle}</div>
+            <div class="secondary">
+              $i18n{touchpadHapticFeedbackSecondaryText}
+            </div>
           </div>
           <cr-toggle id="touchpadHapticFeedbackToggle"
               checked="{{prefs.settings.touchpad.haptic_feedback.value}}"

chrome/browser/resources/settings/lazy_load.ts

diff --git a/chrome/browser/resources/settings/lazy_load.ts b/chrome/browser/resources/settings/lazy_load.ts
index 58493c3..fada7f5 100644
--- a/chrome/browser/resources/settings/lazy_load.ts
+++ b/chrome/browser/resources/settings/lazy_load.ts
@@ -110,7 +110,8 @@
 export {ImportDataBrowserProxyImpl, ImportDataStatus} from './people_page/import_data_browser_proxy.js';
 // </if>
 // <if expr="not chromeos">
-export {ManageProfileBrowserProxyImpl, ProfileShortcutStatus} from './people_page/manage_profile_browser_proxy.js';
+export {SettingsManageProfileElement} from './people_page/manage_profile.js';
+export {ManageProfileBrowserProxy, ManageProfileBrowserProxyImpl, ProfileShortcutStatus} from './people_page/manage_profile_browser_proxy.js';
 // </if>
 export {SettingsCollapseRadioButtonElement} from './privacy_page/collapse_radio_button.js';
 export {SettingsCookiesPageElement} from './privacy_page/cookies_page.js';

chrome/browser/resources/settings/people_page/manage_profile.ts

diff --git a/chrome/browser/resources/settings/people_page/manage_profile.ts b/chrome/browser/resources/settings/people_page/manage_profile.ts
index 41108fc..bd21173 100644
--- a/chrome/browser/resources/settings/people_page/manage_profile.ts
+++ b/chrome/browser/resources/settings/people_page/manage_profile.ts
@@ -34,7 +34,14 @@
       RouteObserverMixinInterface
     };
 
-class SettingsManageProfileElement extends SettingsManageProfileElementBase {
+export interface SettingsManageProfileElement {
+  $: {
+    name: CrInputElement,
+  };
+}
+
+export class SettingsManageProfileElement extends
+    SettingsManageProfileElementBase {
   static get is() {
     return 'settings-manage-profile';
   }
@@ -122,8 +129,7 @@
   currentRouteChanged() {
     if (Router.getInstance().getCurrentRoute() === routes.MANAGE_PROFILE) {
       if (this.profileName) {
-        const profileNameInput =
-            this.shadowRoot!.querySelector<CrInputElement>('#name');
+        const profileNameInput = this.$.name;
         if (profileNameInput) {
           profileNameInput.value = this.profileName;
         }
@@ -198,5 +204,11 @@
   }
 }
 
+declare global {
+  interface HTMLElementTagNameMap {
+    'settings-manage-profile': SettingsManageProfileElement;
+  }
+}
+
 customElements.define(
     SettingsManageProfileElement.is, SettingsManageProfileElement);

chrome/browser/resources/settings/people_page/people_page.ts

diff --git a/chrome/browser/resources/settings/people_page/people_page.ts b/chrome/browser/resources/settings/people_page/people_page.ts
index c838869..ab68b077 100644
--- a/chrome/browser/resources/settings/people_page/people_page.ts
+++ b/chrome/browser/resources/settings/people_page/people_page.ts
@@ -48,7 +48,7 @@
 
 type FocusConfig = Map<string, (string|(() => void))>;
 
-interface SettingsPeoplePageElement {
+export interface SettingsPeoplePageElement {
   $: {
     importDataDialogTrigger: HTMLElement,
     toast: CrToastElement,
@@ -61,7 +61,7 @@
       RouteObserverMixinInterface
     };
 
-class SettingsPeoplePageElement extends SettingsPeoplePageElementBase {
+export class SettingsPeoplePageElement extends SettingsPeoplePageElementBase {
   static get is() {
     return 'settings-people-page';
   }
@@ -186,6 +186,7 @@
     };
   }
 
+  prefs: any;
   private signinAllowed_: boolean;
   syncStatus: SyncStatus|null;
   pageVisibility: PageVisibility;
@@ -406,4 +407,10 @@
   }
 }
 
+declare global {
+  interface HTMLElementTagNameMap {
+    'settings-people-page': SettingsPeoplePageElement;
+  }
+}
+
 customElements.define(SettingsPeoplePageElement.is, SettingsPeoplePageElement);

chrome/browser/resources/settings/people_page/signout_dialog.ts

diff --git a/chrome/browser/resources/settings/people_page/signout_dialog.ts b/chrome/browser/resources/settings/people_page/signout_dialog.ts
index 30b2f3c7..fcb60ff 100644
--- a/chrome/browser/resources/settings/people_page/signout_dialog.ts
+++ b/chrome/browser/resources/settings/people_page/signout_dialog.ts
@@ -28,6 +28,7 @@
 export interface SettingsSignoutDialogElement {
   $: {
     dialog: CrDialogElement,
+    disconnectConfirm: HTMLElement,
   };
 }
 

chrome/browser/resources/settings/settings.ts

diff --git a/chrome/browser/resources/settings/settings.ts b/chrome/browser/resources/settings/settings.ts
index 702cce06..7165097 100644
--- a/chrome/browser/resources/settings/settings.ts
+++ b/chrome/browser/resources/settings/settings.ts
@@ -7,6 +7,7 @@
 export {CrButtonElement} from 'chrome://resources/cr_elements/cr_button/cr_button.m.js';
 export {CrDrawerElement} from 'chrome://resources/cr_elements/cr_drawer/cr_drawer.js';
 export {CrLinkRowElement} from 'chrome://resources/cr_elements/cr_link_row/cr_link_row.js';
+export {CrToggleElement} from 'chrome://resources/cr_elements/cr_toggle/cr_toggle.m.js';
 export {CrToolbarElement} from 'chrome://resources/cr_elements/cr_toolbar/cr_toolbar.js';
 export {CrToolbarSearchFieldElement} from 'chrome://resources/cr_elements/cr_toolbar/cr_toolbar_search_field.js';
 export {PluralStringProxyImpl as SettingsPluralStringProxyImpl} from 'chrome://resources/js/plural_string_proxy.js';
@@ -45,8 +46,9 @@
 export {OpenWindowProxy, OpenWindowProxyImpl} from './open_window_proxy.js';
 export {pageVisibility, setPageVisibilityForTesting} from './page_visibility.js';
 // <if expr="chromeos">
-export {AccountManagerBrowserProxyImpl} from './people_page/account_manager_browser_proxy.js';
+export {AccountManagerBrowserProxy, AccountManagerBrowserProxyImpl} from './people_page/account_manager_browser_proxy.js';
 // </if>
+export {SettingsPeoplePageElement} from './people_page/people_page.js';
 export {ProfileInfoBrowserProxyImpl} from './people_page/profile_info_browser_proxy.js';
 export {MAX_SIGNIN_PROMO_IMPRESSION} from './people_page/sync_account_control.js';
 export {PageStatus, StatusAction, StoredAccount, SyncBrowserProxy, SyncBrowserProxyImpl, SyncPrefs, syncPrefsIndividualDataTypes, SyncStatus} from './people_page/sync_browser_proxy.js';

chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc

diff --git a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc
index 88749d2..e09fe4e2 100644
--- a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc
@@ -25,6 +25,7 @@
 #include "build/build_config.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/profiles/profile_attributes_storage.h"
+#include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/safe_browsing/incident_reporting/incident.h"
 #include "chrome/browser/safe_browsing/incident_reporting/incident_receiver.h"
 #include "chrome/browser/safe_browsing/incident_reporting/incident_report_uploader.h"
@@ -212,6 +213,7 @@
     ASSERT_TRUE(profile_manager_.SetUp());
     // Disable profile metrics reporting, otherwise the calls to
     // FastForwardUntilNoTasksRemain() never return.
+    profile_manager_.profile_manager()->DisableProfileMetricsForTesting();
     profile_manager_.profile_attributes_storage()
         ->DisableProfileMetricsForTesting();
   }

chrome/browser/ui/ash/cast_config_controller_media_router.cc

diff --git a/chrome/browser/ui/ash/cast_config_controller_media_router.cc b/chrome/browser/ui/ash/cast_config_controller_media_router.cc
index e3e0326..b173d13 100644
--- a/chrome/browser/ui/ash/cast_config_controller_media_router.cc
+++ b/chrome/browser/ui/ash/cast_config_controller_media_router.cc
@@ -10,11 +10,13 @@
 
 #include "base/callback.h"
 #include "base/callback_helpers.h"
+#include "base/feature_list.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ash/profiles/profile_helper.h"
 #include "chrome/browser/media/router/media_router_feature.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/ui_features.h"
 #include "chrome/common/url_constants.h"
 #include "components/media_router/browser/media_router.h"
 #include "components/media_router/browser/media_router_factory.h"
@@ -194,6 +196,13 @@
   return false;
 }
 
+bool CastConfigControllerMediaRouter::AccessCodeCastingEnabled() const {
+  Profile* profile = GetProfile();
+  return base::FeatureList::IsEnabled(::features::kAccessCodeCastUI) &&
+         profile &&
+         media_router::GetAccessCodeCastEnabledPref(profile->GetPrefs());
+}
+
 void CastConfigControllerMediaRouter::RequestDeviceRefresh() {
   // The media router component isn't ready yet.
   if (!device_cache())

chrome/browser/ui/ash/cast_config_controller_media_router.h

diff --git a/chrome/browser/ui/ash/cast_config_controller_media_router.h b/chrome/browser/ui/ash/cast_config_controller_media_router.h
index 84a8ad3d..ee5ae2f 100644
--- a/chrome/browser/ui/ash/cast_config_controller_media_router.h
+++ b/chrome/browser/ui/ash/cast_config_controller_media_router.h
@@ -42,6 +42,7 @@
   void RemoveObserver(Observer* observer) override;
   bool HasSinksAndRoutes() const override;
   bool HasActiveRoute() const override;
+  bool AccessCodeCastingEnabled() const override;
   void RequestDeviceRefresh() override;
   const std::vector<ash::SinkAndRoute>& GetSinksAndRoutes() override;
   void CastToSink(const std::string& sink_id) override;

chrome/browser/ui/ash/system_tray_client_impl.cc

diff --git a/chrome/browser/ui/ash/system_tray_client_impl.cc b/chrome/browser/ui/ash/system_tray_client_impl.cc
index dc25d83..7e450f6 100644
--- a/chrome/browser/ui/ash/system_tray_client_impl.cc
+++ b/chrome/browser/ui/ash/system_tray_client_impl.cc
@@ -35,6 +35,7 @@
 #include "chrome/browser/ui/settings_window_manager_chromeos.h"
 #include "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/browser/ui/web_applications/system_web_app_ui_utils.h"
+#include "chrome/browser/ui/webui/access_code_cast/access_code_cast_ui.h"
 #include "chrome/browser/ui/webui/chromeos/bluetooth_pairing_dialog.h"
 #include "chrome/browser/ui/webui/chromeos/internet_config_dialog.h"
 #include "chrome/browser/ui/webui/chromeos/internet_detail_dialog.h"
@@ -580,6 +581,10 @@
   chrome::AttemptUserExit();
 }
 
+void SystemTrayClientImpl::ShowAccessCodeCastingDialog() {
+  AccessCodeCastDialog::Show();
+}
+
 SystemTrayClientImpl::SystemTrayClientImpl(SystemTrayClientImpl* mock_instance)
     : system_tray_(nullptr) {
   DCHECK(!g_system_tray_client_instance);

chrome/browser/ui/ash/system_tray_client_impl.h

diff --git a/chrome/browser/ui/ash/system_tray_client_impl.h b/chrome/browser/ui/ash/system_tray_client_impl.h
index 0c0d726..c41c4f80 100644
--- a/chrome/browser/ui/ash/system_tray_client_impl.h
+++ b/chrome/browser/ui/ash/system_tray_client_impl.h
@@ -94,6 +94,7 @@
   void ShowMultiDeviceSetup() override;
   void RequestRestartForUpdate() override;
   void SetLocaleAndExit(const std::string& locale_iso_code) override;
+  void ShowAccessCodeCastingDialog() override;
 
  protected:
   // Used by mocks in tests.

chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc

diff --git a/chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc b/chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc
index 5b6e7618..3f6e34e 100644
--- a/chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc
+++ b/chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc
@@ -9,19 +9,30 @@
 #include "ash/public/cpp/cast_config_controller.h"
 #include "ash/public/cpp/system_tray_test_api.h"
 #include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/ash/login/login_manager_test.h"
+#include "chrome/browser/ash/login/test/login_manager_mixin.h"
+#include "chrome/browser/ash/profiles/profile_helper.h"
+#include "chrome/browser/media/router/media_router_feature.h"
+#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/ash/cast_config_controller_media_router.h"
+#include "chrome/browser/ui/ui_features.h"
 #include "chrome/test/base/in_process_browser_test.h"
+#include "components/account_id/account_id.h"
 #include "components/media_router/browser/media_routes_observer.h"
 #include "components/media_router/browser/media_sinks_observer.h"
 #include "components/media_router/browser/test/mock_media_router.h"
 #include "components/media_router/common/media_source.h"
 #include "components/media_router/common/test/test_helper.h"
+#include "components/prefs/pref_service.h"
+#include "components/user_manager/user_manager.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/test_utils.h"
 #include "ui/message_center/message_center.h"
 #include "url/gurl.h"
 
+using chromeos::ProfileHelper;
 using testing::_;
+using user_manager::UserManager;
 
 namespace {
 
@@ -209,3 +220,82 @@
   content::RunAllPendingInMessageLoop();
   EXPECT_FALSE(IsCastingNotificationVisible());
 }
+
+class SystemTrayTrayCastAccessCodeChromeOSTest : public ash::LoginManagerTest {
+ public:
+  SystemTrayTrayCastAccessCodeChromeOSTest() : LoginManagerTest() {
+    scoped_feature_list_.InitAndEnableFeature(::features::kAccessCodeCastUI);
+
+    // Use consumer emails to avoid having to fake a policy fetch.
+    login_mixin_.AppendRegularUsers(2);
+    account_id1_ = login_mixin_.users()[0].account_id;
+    account_id2_ = login_mixin_.users()[1].account_id;
+  }
+
+  SystemTrayTrayCastAccessCodeChromeOSTest(
+      const SystemTrayTrayCastAccessCodeChromeOSTest&) = delete;
+  SystemTrayTrayCastAccessCodeChromeOSTest& operator=(
+      const SystemTrayTrayCastAccessCodeChromeOSTest&) = delete;
+
+  ~SystemTrayTrayCastAccessCodeChromeOSTest() override = default;
+
+  void SetUpOnMainThread() override {
+    LoginManagerTest::SetUpOnMainThread();
+    tray_test_api_ = ash::SystemTrayTestApi::Create();
+  }
+
+ protected:
+  void SetupUserProfile(const AccountId& account_id, bool allow_access_code) {
+    const user_manager::User* user = UserManager::Get()->FindUser(account_id);
+    Profile* profile = ProfileHelper::Get()->GetProfileByUser(user);
+    profile->GetPrefs()->SetBoolean(media_router::prefs::kAccessCodeCastEnabled,
+                                    allow_access_code);
+    content::RunAllTasksUntilIdle();
+  }
+
+  void ShowBubble() { tray_test_api_->ShowBubble(); }
+
+  void CloseBubble() { tray_test_api_->CloseBubble(); }
+
+  bool IsViewDrawn(int view_id) {
+    return tray_test_api_->IsBubbleViewVisible(view_id, /* open_tray */ false);
+  }
+
+  void ClickView(int view_id) { tray_test_api_->ClickBubbleView(view_id); }
+
+  bool IsTrayVisible() { return IsViewDrawn(ash::VIEW_ID_CAST_MAIN_VIEW); }
+
+  AccountId account_id1_;
+  AccountId account_id2_;
+
+ private:
+  ash::LoginManagerMixin login_mixin_{&mixin_host_};
+  std::unique_ptr<ash::SystemTrayTestApi> tray_test_api_;
+  base::test::ScopedFeatureList scoped_feature_list_;
+};
+
+IN_PROC_BROWSER_TEST_F(SystemTrayTrayCastAccessCodeChromeOSTest,
+                       PolicyOffNoSinksNoVisibleTray) {
+  // Login a user that does not have access code casting enabled
+  LoginUser(account_id1_);
+  SetupUserProfile(account_id1_, /* allow_access_code */ false);
+
+  ShowBubble();
+
+  // Since there are no sinks and this user does not have access code casting
+  // enabled, the tray should not be visible.
+  EXPECT_FALSE(IsTrayVisible());
+}
+
+IN_PROC_BROWSER_TEST_F(SystemTrayTrayCastAccessCodeChromeOSTest,
+                       PolicyOnNoSinksVisibleTray) {
+  // Login a user that does not have access code casting enabled
+  LoginUser(account_id2_);
+  SetupUserProfile(account_id2_, /* allow_access_code */ true);
+
+  ShowBubble();
+
+  // Even though there are no sinks, since this user does have access code
+  // casting enabled, the tray should not be visible.
+  EXPECT_TRUE(IsTrayVisible());
+}

chrome/browser/ui/autofill/autofill_popup_controller_impl.cc

diff --git a/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc b/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc
index d87440f..83b1f92 100644
--- a/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc
+++ b/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc
@@ -471,7 +471,8 @@
 
   if (selected_line_) {
     delegate_->DidSelectSuggestion(suggestions_[*selected_line_].value,
-                                   suggestions_[*selected_line_].frontend_id);
+                                   suggestions_[*selected_line_].frontend_id,
+                                   suggestions_[*selected_line_].backend_id);
   } else {
     delegate_->ClearPreviewedForm();
   }

chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc

diff --git a/chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc b/chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc
index 6305701..37b7d04 100644
--- a/chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc
+++ b/chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc
@@ -116,8 +116,9 @@
   ~MockAutofillExternalDelegate() override = default;
 
   void DidSelectSuggestion(const std::u16string& value,
-                           int identifier) override {}
-  bool RemoveSuggestion(const std::u16string& value, int identifier) override {
+                           int frontend_id,
+                           const std::string& backend_id) override {}
+  bool RemoveSuggestion(const std::u16string& value, int frontend_id) override {
     return true;
   }
   base::WeakPtr<AutofillExternalDelegate> GetWeakPtr() {

chrome/browser/ui/views/omnibox/omnibox_view_views.cc

diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
index 8ce8313..b8dbe2b 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
@@ -1734,7 +1734,7 @@
   model()->AdjustTextForCopy(GetSelectedRange().GetMin(), &selected_text, &url,
                              &write_url);
   if (IsSelectAll()) {
-    UMA_HISTOGRAM_COUNTS_1M(OmniboxEditModel::kCutOrCopyAllTextHistogram, 1);
+    UMA_HISTOGRAM_COUNTS_1M("Omnibox.CutOrCopyAllText", 1);
 
     if (clipboard_buffer != ui::ClipboardBuffer::kSelection &&
         location_bar_view_) {

chrome/browser/ui/webui/settings/chromeos/device_section.cc

diff --git a/chrome/browser/ui/webui/settings/chromeos/device_section.cc b/chrome/browser/ui/webui/settings/chromeos/device_section.cc
index afd97ab..486d5062 100644
--- a/chrome/browser/ui/webui/settings/chromeos/device_section.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/device_section.cc
@@ -1246,8 +1246,10 @@
       {"touchpadAccelerationLabel", IDS_SETTINGS_TOUCHPAD_ACCELERATION_LABEL},
       {"touchpadHapticClickSensitivityLabel",
        IDS_SETTINGS_TOUCHPAD_HAPTIC_CLICK_SENSITIVITY_LABEL},
-      {"touchpadHapticFeedbackLabel",
-       IDS_SETTINGS_TOUCHPAD_HAPTIC_FEEDBACK_LABEL},
+      {"touchpadHapticFeedbackTitle",
+       IDS_SETTINGS_TOUCHPAD_HAPTIC_FEEDBACK_TITLE},
+      {"touchpadHapticFeedbackSecondaryText",
+       IDS_SETTINGS_TOUCHPAD_HAPTIC_FEEDBACK_SECONDARY_TEXT},
       {"touchpadHapticFirmClickLabel",
        IDS_SETTINGS_TOUCHPAD_HAPTIC_FIRM_CLICK_LABEL},
       {"touchpadHapticLightClickLabel",

chrome/build/linux.pgo.txt

diff --git a/chrome/build/linux.pgo.txt b/chrome/build/linux.pgo.txt
index ffec471..0535b85 100644
--- a/chrome/build/linux.pgo.txt
+++ b/chrome/build/linux.pgo.txt
@@ -1 +1 @@
-chrome-linux-main-1639137509-42c7fd1f7bb69cb728d7e9572a384b2885623e1b.profdata
+chrome-linux-main-1639158968-32fe2454101e8dd08e524e1a7a9b4849054b28b5.profdata

chrome/build/mac.pgo.txt

diff --git a/chrome/build/mac.pgo.txt b/chrome/build/mac.pgo.txt
index a443ff7b..442060c7 100644
--- a/chrome/build/mac.pgo.txt
+++ b/chrome/build/mac.pgo.txt
@@ -1 +1 @@
-chrome-mac-main-1639137509-752a12a20648290cd0d533cdd50037acb4be801c.profdata
+chrome-mac-main-1639158968-9c4955c4f4cfe7457f24c76f8234a10f17d9496a.profdata

chrome/build/win32.pgo.txt

diff --git a/chrome/build/win32.pgo.txt b/chrome/build/win32.pgo.txt
index 6d803d39..314b4f2 100644
--- a/chrome/build/win32.pgo.txt
+++ b/chrome/build/win32.pgo.txt
@@ -1 +1 @@
-chrome-win32-main-1639137509-7656292b5d5f3095eadb4d2b8aed78b55bdb206a.profdata
+chrome-win32-main-1639158968-a3623411bbd59aec7fe153b0fb1be440d8fb8ffa.profdata

chrome/build/win64.pgo.txt

diff --git a/chrome/build/win64.pgo.txt b/chrome/build/win64.pgo.txt
index 2f6bc65..3ee0b2a 100644
--- a/chrome/build/win64.pgo.txt
+++ b/chrome/build/win64.pgo.txt
@@ -1 +1 @@
-chrome-win64-main-1639126634-bacbc02510d87233795ca8c47b4a7b4d41b41b38.profdata
+chrome-win64-main-1639158968-6092feccabaad3c71e7ed9b76264f882a5d26943.profdata

chrome/test/data/webui/access_code_cast/access_code_cast_test.js

diff --git a/chrome/test/data/webui/access_code_cast/access_code_cast_test.js b/chrome/test/data/webui/access_code_cast/access_code_cast_test.js
index 2f88d75..354d539 100644
--- a/chrome/test/data/webui/access_code_cast/access_code_cast_test.js
+++ b/chrome/test/data/webui/access_code_cast/access_code_cast_test.js
@@ -4,6 +4,52 @@
 
 import 'chrome://access-code-cast/access_code_cast.js';
 
+import {AddSinkResultCode, CastDiscoveryMethod, PageCallbackRouter} from 'chrome://access-code-cast/access_code_cast.mojom-webui.js';
+import {BrowserProxy} from 'chrome://access-code-cast/browser_proxy.js';
+import {RouteRequestResultCode} from 'chrome://access-code-cast/route_request_result_code.mojom-webui.js';
+
+import {TestBrowserProxy} from '../test_browser_proxy.js';
+
+class TestAccessCodeCastBrowserProxy extends TestBrowserProxy {
+  constructor (addResult, castResult, castCallback) {
+    super([
+      'addSink',
+      'castToSink'
+    ]);
+
+    this.addResult = addResult;
+    this.castResult = castResult;
+    this.castCallback = castCallback;
+  }
+
+  /** @override */
+  addSink(accessCode, discoveryMethod) {
+    this.methodCalled('addSink', {accessCode, discoveryMethod});
+    return Promise.resolve({resultCode: this.addResult});
+  }
+
+  /** @override */
+  castToSink() {
+    this.castCallback();
+    this.methodCalled('castToSink');
+    return Promise.resolve({resultCode: this.castResult});
+  }
+}
+
+/**
+ * Creates a mock test proxy.
+ * @return {TestBrowserProxy}
+ */
+export function createTestProxy(addResult, castResult, castCallback) {
+  const callbackRouter = new PageCallbackRouter();
+  return {
+    callbackRouter,
+    callbackRouterRemote: callbackRouter.$.bindNewPipeAndPassRemote(),
+    handler: new TestAccessCodeCastBrowserProxy(
+      addResult, castResult, castCallback),
+  };
+}
+
 suite('AccessCodeCastAppTest', () => {
   /** @type {!AccessCodeCastElement} */
   let app;
@@ -38,4 +84,82 @@
     assertFalse(app.$.codeInputView.hidden);
     assertTrue(app.$.qrInputView.hidden);
   });
+
+  test('addSinkAndCast sends correct accessCode to the handler', () => {
+    const testProxy = createTestProxy(
+      AddSinkResultCode.OK,
+      RouteRequestResultCode.OK,
+      () => {}
+    );
+    BrowserProxy.setInstance(testProxy);
+
+    app.setAccessCodeForTest('qwerty');
+    app.switchToCodeInput();
+
+    app.addSinkAndCast();
+    testProxy.handler.whenCalled('addSink').then(
+      ({accessCode, discoveryMethod}) => {
+        assertEquals(accessCode, 'qwerty');
+        assertEquals(discoveryMethod, CastDiscoveryMethod.INPUT_ACCESS_CODE);
+      }
+    );
+  });
+
+  test('addSinkAndCast sends correct discoveryMethod to the handler', () => {
+    const testProxy = createTestProxy(
+      AddSinkResultCode.OK,
+      RouteRequestResultCode.OK,
+      () => {}
+    );
+    BrowserProxy.setInstance(testProxy);
+
+    app.setAccessCodeForTest('123456');
+    app.switchToQrInput();
+
+    app.addSinkAndCast();
+    testProxy.handler.whenCalled('addSink').then(
+      ({accessCode, discoveryMethod}) => {
+        assertEquals(accessCode, '123456');
+        assertEquals(discoveryMethod, CastDiscoveryMethod.QR_CODE);
+      }
+    );
+  });
+
+  test('addSinkAndCast calls castToSink if add is successful', async () => {
+    let visited = false;
+    app.setAccessCodeForTest('qwerty');
+    const visitedCallback = () => {
+      visited = true;
+    };
+    const testProxy = createTestProxy(
+      AddSinkResultCode.OK,
+      RouteRequestResultCode.OK,
+      visitedCallback
+    );
+    BrowserProxy.setInstance(testProxy);
+
+    assertFalse(visited);
+    await app.addSinkAndCast();
+    assertTrue(visited);
+  });
+
+  test('addSinkAndCast does not call castToSink if add is not successful',
+    async () => {
+      let visited = false;
+      app.setAccessCodeForTest('qwerty');
+      const visitedCallback = () => {
+        visited = true;
+      };
+      const testProxy = createTestProxy(
+        AddSinkResultCode.UNKNOWN_ERROR,
+        RouteRequestResultCode.OK,
+        visitedCallback
+      );
+      BrowserProxy.setInstance(testProxy);
+
+      assertFalse(visited);
+      await app.addSinkAndCast();
+      assertFalse(visited);
+    }
+  );
 });

chrome/test/data/webui/cr_components/chromeos/bluetooth/bluetooth_pairing_ui_test.js

diff --git a/chrome/test/data/webui/cr_components/chromeos/bluetooth/bluetooth_pairing_ui_test.js b/chrome/test/data/webui/cr_components/chromeos/bluetooth/bluetooth_pairing_ui_test.js
index de7eaec..971b410 100644
--- a/chrome/test/data/webui/cr_components/chromeos/bluetooth/bluetooth_pairing_ui_test.js
+++ b/chrome/test/data/webui/cr_components/chromeos/bluetooth/bluetooth_pairing_ui_test.js
@@ -578,43 +578,49 @@
     await finishedPromise;
   });
 
-  test('Pair with a specific device by address, failure', async function() {
-    const deviceId1 = '123456';
-    await pairByDeviceAddress(/*address=*/ deviceId1);
+  // TODO(b/210128630) Fix flaky test. Closure compiler complains about using
+  // test.skip() here, see
+  // https://ci.chromium.org/ui/p/chromium/builders/try/linux-chromeos-rel/1058566/overview.
+  // test(
+  //     'Pair with a specific device by address, failure', async function() {
+  //       const deviceId1 = '123456';
+  //       await pairByDeviceAddress(/*address=*/ deviceId1);
 
-    const deviceHandler = bluetoothConfig.getLastCreatedPairingHandler();
-    deviceHandler.completePairDevice(/*success=*/ false);
+  //       const deviceHandler = bluetoothConfig.getLastCreatedPairingHandler();
+  //       deviceHandler.completePairDevice(/*success=*/ false);
 
-    // Wait for the callback to finish (flushTasks() doesn't wait long enough
-    // here).
-    await waitAfterNextRender(bluetoothPairingUi);
+  //       // Wait for the callback to finish (flushTasks() doesn't wait long
+  //       // enough here).
+  //       await waitAfterNextRender(bluetoothPairingUi);
 
-    // On failure, the device selection page should be shown.
-    assertTrue(!!getDeviceSelectionPage());
-    assertEquals(getDeviceSelectionPage().failedPairingDeviceId, deviceId1);
+  //       // On failure, the device selection page should be shown.
+  //       assertTrue(!!getDeviceSelectionPage());
+  //       assertEquals(getDeviceSelectionPage().failedPairingDeviceId,
+  //       deviceId1);
 
-    // There should no longer be a device-specific address to pair to.
-    assertFalse(!!bluetoothPairingUi.pairingDeviceAddress);
+  //       // There should no longer be a device-specific address to pair to.
+  //       assertFalse(!!bluetoothPairingUi.pairingDeviceAddress);
 
-    // Verify we can pair with another device.
-    const device2 = createDefaultBluetoothDevice(
-        /*id=*/ '34567',
-        /*publicName=*/ 'BeatsX',
-        /*connectionState=*/
-        chromeos.bluetoothConfig.mojom.DeviceConnectionState.kConnected,
-        /*opt_nickname=*/ 'device1',
-        /*opt_audioCapability=*/
-        mojom.AudioOutputCapability.kCapableOfAudioOutput,
-        /*opt_deviceType=*/ mojom.DeviceType.kMouse);
-    bluetoothConfig.appendToDiscoveredDeviceList([device2.deviceProperties]);
-    await flushTasks();
+  //       // Verify we can pair with another device.
+  //       const device2 = createDefaultBluetoothDevice(
+  //           /*id=*/ '34567',
+  //           /*publicName=*/ 'BeatsX',
+  //           /*connectionState=*/
+  //           chromeos.bluetoothConfig.mojom.DeviceConnectionState.kConnected,
+  //           /*opt_nickname=*/ 'device1',
+  //           /*opt_audioCapability=*/
+  //           mojom.AudioOutputCapability.kCapableOfAudioOutput,
+  //           /*opt_deviceType=*/ mojom.DeviceType.kMouse);
+  //       bluetoothConfig.appendToDiscoveredDeviceList(
+  //           [device2.deviceProperties]);
+  //       await flushTasks();
 
-    let finishedPromise = eventToPromise('finished', bluetoothPairingUi);
-    await selectDevice(device2.deviceProperties);
+  //       let finishedPromise = eventToPromise('finished', bluetoothPairingUi);
+  //       await selectDevice(device2.deviceProperties);
 
-    deviceHandler.completePairDevice(/*success=*/ true);
-    await finishedPromise;
-  });
+  //       deviceHandler.completePairDevice(/*success=*/ true);
+  //       await finishedPromise;
+  //     });
 
   test('Pair with a specific device by address with auth', async function() {
     await pairByDeviceAddress(/*address=*/ '123456');

chrome/test/data/webui/settings/BUILD.gn

diff --git a/chrome/test/data/webui/settings/BUILD.gn b/chrome/test/data/webui/settings/BUILD.gn
index 7dec2555..4d193f6 100644
--- a/chrome/test/data/webui/settings/BUILD.gn
+++ b/chrome/test/data/webui/settings/BUILD.gn
@@ -12,6 +12,7 @@
   "appearance_page_test.ts",
   "clear_browsing_data_test.ts",
   "downloads_page_test.ts",
+  "people_page_test.ts",
   "personalization_options_test.ts",
   "privacy_page_test.ts",
   "route_tests.js",
@@ -74,7 +75,6 @@
   "people_page_sync_controls_test.js",
   "people_page_sync_page_interactive_test.js",
   "people_page_sync_page_test.js",
-  "people_page_test.js",
   "prefs_test_cases.ts",
   "prefs_tests.js",
   "pref_util_tests.ts",
@@ -147,7 +147,7 @@
 
 if (is_chromeos_ash) {
   non_preprocessed_files += [
-    "people_page_test_cros.js",
+    "people_page_test_cros.ts",
     "site_list_tests_cros.ts",
     "test_android_info_browser_proxy.ts",
   ]
@@ -155,7 +155,7 @@
   non_preprocessed_files += [
     "languages_tests.js",
     "metrics_reporting_tests.ts",
-    "people_page_manage_profile_test.js",
+    "people_page_manage_profile_test.ts",
   ]
 }
 

chrome/test/data/webui/settings/people_page_manage_profile_test.js

diff --git a/chrome/test/data/webui/settings/people_page_manage_profile_test.js b/chrome/test/data/webui/settings/people_page_manage_profile_test.js
deleted file mode 100644
index 7d57996..0000000
--- a/chrome/test/data/webui/settings/people_page_manage_profile_test.js
+++ /dev/null
@@ -1,256 +0,0 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// clang-format off
-import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
-import {ManageProfileBrowserProxyImpl, ProfileShortcutStatus} from 'chrome://settings/lazy_load.js';
-import {Router, routes} from 'chrome://settings/settings.js';
-import {TestBrowserProxy} from 'chrome://webui-test/test_browser_proxy.js';
-// clang-format on
-
-/** @implements {ManageProfileBrowserProxy} */
-class TestManageProfileBrowserProxy extends TestBrowserProxy {
-  constructor() {
-    super([
-      'getAvailableIcons',
-      'setProfileIconToGaiaAvatar',
-      'setProfileIconToDefaultAvatar',
-      'setProfileName',
-      'getProfileShortcutStatus',
-      'addProfileShortcut',
-      'removeProfileShortcut',
-    ]);
-
-    /** @private {!ProfileShortcutStatus} */
-    this.profileShortcutStatus_ = ProfileShortcutStatus.PROFILE_SHORTCUT_FOUND;
-  }
-
-  /** @param {!ProfileShortcutStatus} status */
-  setProfileShortcutStatus(status) {
-    this.profileShortcutStatus_ = status;
-  }
-
-  /** @override */
-  getAvailableIcons() {
-    this.methodCalled('getAvailableIcons');
-    return Promise.resolve([
-      {url: 'fake-icon-1.png', label: 'fake-icon-1', index: 1},
-      {url: 'fake-icon-2.png', label: 'fake-icon-2', index: 2, selected: true},
-      {url: 'gaia-icon.png', label: 'gaia-icon', isGaiaAvatar: true},
-    ]);
-  }
-
-  /** @override */
-  setProfileIconToGaiaAvatar() {
-    this.methodCalled('setProfileIconToGaiaAvatar');
-  }
-
-  /** @override */
-  setProfileIconToDefaultAvatar(index) {
-    this.methodCalled('setProfileIconToDefaultAvatar', [index]);
-  }
-
-  /** @override */
-  setProfileName(name) {
-    this.methodCalled('setProfileName', [name]);
-  }
-
-  /** @override */
-  getProfileShortcutStatus() {
-    this.methodCalled('getProfileShortcutStatus');
-    return Promise.resolve(this.profileShortcutStatus_);
-  }
-
-  /** @override */
-  addProfileShortcut() {
-    this.methodCalled('addProfileShortcut');
-  }
-
-  /** @override */
-  removeProfileShortcut() {
-    this.methodCalled('removeProfileShortcut');
-  }
-}
-
-suite('ManageProfileTests', function() {
-  let manageProfile = null;
-  let browserProxy = null;
-
-  setup(function() {
-    browserProxy = new TestManageProfileBrowserProxy();
-    ManageProfileBrowserProxyImpl.setInstance(browserProxy);
-    PolymerTest.clearBody();
-    loadTimeData.overrideValues({profileShortcutsEnabled: false});
-    manageProfile = createManageProfileElement();
-    Router.getInstance().navigateTo(routes.MANAGE_PROFILE);
-  });
-
-  teardown(function() {
-    manageProfile.remove();
-  });
-
-  function createManageProfileElement() {
-    const manageProfileElement =
-        document.createElement('settings-manage-profile');
-    manageProfileElement.profileIconUrl = 'fake-icon-1.png';
-    manageProfileElement.profileName = 'Initial Fake Name';
-    manageProfileElement.syncStatus = {supervisedUser: false, childUser: false};
-    document.body.appendChild(manageProfileElement);
-    return manageProfileElement;
-  }
-
-  // Tests that the manage profile subpage
-  //  - gets and receives all the available icons
-  //  - can select a new icon
-  test('ManageProfileChangeIcon', async function() {
-    let items = null;
-    await browserProxy.whenCalled('getAvailableIcons');
-    flush();
-    items = manageProfile.shadowRoot.querySelector('cr-profile-avatar-selector')
-                .shadowRoot.querySelector('#avatar-grid')
-                .querySelectorAll('.avatar');
-
-    assertFalse(!!manageProfile.profileAvatar);
-    assertEquals(3, items.length);
-    assertFalse(items[0].classList.contains('iron-selected'));
-    assertTrue(items[1].classList.contains('iron-selected'));
-    assertFalse(items[2].classList.contains('iron-selected'));
-
-    items[1].click();
-    const args = await browserProxy.whenCalled('setProfileIconToDefaultAvatar');
-    assertEquals(2, args[0]);
-
-    items[2].click();
-    await browserProxy.whenCalled('setProfileIconToGaiaAvatar');
-
-  });
-
-  test('ManageProfileChangeName', async function() {
-    const nameField = manageProfile.shadowRoot.querySelector('#name');
-    assertTrue(!!nameField);
-    assertFalse(!!nameField.disabled);
-    assertEquals('.*\\S.*', nameField.pattern);
-
-    assertEquals('Initial Fake Name', nameField.value);
-
-    nameField.value = 'New Name';
-    nameField.fire('change');
-
-    const args = await browserProxy.whenCalled('setProfileName');
-    assertEquals('New Name', args[0]);
-  });
-
-  test('ProfileNameIsDisabledForSupervisedUser', function() {
-    manageProfile.syncStatus = {supervisedUser: true, childUser: false};
-
-    const nameField = manageProfile.shadowRoot.querySelector('#name');
-    assertTrue(!!nameField);
-
-    // Name field should be disabled for legacy supervised users.
-    assertTrue(!!nameField.disabled);
-  });
-
-  // Tests profile name updates pushed from the browser.
-  test('ManageProfileNameUpdated', async function() {
-    const nameField = manageProfile.shadowRoot.querySelector('#name');
-    assertTrue(!!nameField);
-
-    await browserProxy.whenCalled('getAvailableIcons');
-    manageProfile.profileName = 'New Name From Browser';
-
-    flush();
-
-    assertEquals('New Name From Browser', nameField.value);
-  });
-
-  // Tests that the theme selector is visible.
-  test('ProfileThemeSelector', function() {
-    assertTrue(!!manageProfile.shadowRoot.querySelector('#themeSelector'));
-  });
-
-  // Tests profile shortcut toggle is hidden if profile shortcuts feature is
-  // disabled.
-  test('ManageProfileShortcutToggleHidden', function() {
-    const hasShortcutToggle =
-        manageProfile.shadowRoot.querySelector('#hasShortcutToggle');
-    assertFalse(!!hasShortcutToggle);
-  });
-
-  // Tests profile shortcut toggle is visible and toggling it removes and
-  // creates the profile shortcut respectively.
-  test('ManageProfileShortcutToggle', async function() {
-    PolymerTest.clearBody();
-    loadTimeData.overrideValues({profileShortcutsEnabled: true});
-    manageProfile = createManageProfileElement();
-    flush();
-
-    assertFalse(!!manageProfile.shadowRoot.querySelector('#hasShortcutToggle'));
-    await browserProxy.whenCalled('getProfileShortcutStatus');
-
-    flush();
-
-    const hasShortcutToggle =
-        manageProfile.shadowRoot.querySelector('#hasShortcutToggle');
-    assertTrue(!!hasShortcutToggle);
-
-    // The profile shortcut toggle is checked.
-    assertTrue(hasShortcutToggle.checked);
-
-    // Simulate tapping the profile shortcut toggle.
-    hasShortcutToggle.click();
-    await browserProxy.whenCalled('removeProfileShortcut');
-
-    flush();
-
-    // The profile shortcut toggle is checked.
-    assertFalse(hasShortcutToggle.checked);
-
-    // Simulate tapping the profile shortcut toggle.
-    hasShortcutToggle.click();
-    await browserProxy.whenCalled('addProfileShortcut');
-  });
-
-  // Tests profile shortcut toggle is visible and toggled off when no
-  // profile shortcut is found.
-  test('ManageProfileShortcutToggleShortcutNotFound', async function() {
-    browserProxy.setProfileShortcutStatus(
-        ProfileShortcutStatus.PROFILE_SHORTCUT_NOT_FOUND);
-
-    PolymerTest.clearBody();
-    loadTimeData.overrideValues({profileShortcutsEnabled: true});
-    manageProfile = createManageProfileElement();
-    flush();
-
-    assertFalse(!!manageProfile.shadowRoot.querySelector('#hasShortcutToggle'));
-    await browserProxy.whenCalled('getProfileShortcutStatus');
-
-    flush();
-
-    const hasShortcutToggle =
-        manageProfile.shadowRoot.querySelector('#hasShortcutToggle');
-    assertTrue(!!hasShortcutToggle);
-
-    assertFalse(hasShortcutToggle.checked);
-  });
-
-  // Tests the case when the profile shortcut setting is hidden. This can
-  // occur in the single profile case.
-  test('ManageProfileShortcutSettingHidden', async function() {
-    browserProxy.setProfileShortcutStatus(
-        ProfileShortcutStatus.PROFILE_SHORTCUT_SETTING_HIDDEN);
-
-    PolymerTest.clearBody();
-    loadTimeData.overrideValues({profileShortcutsEnabled: true});
-    manageProfile = createManageProfileElement();
-    flush();
-
-    assertFalse(!!manageProfile.shadowRoot.querySelector('#hasShortcutToggle'));
-
-    await browserProxy.whenCalled('getProfileShortcutStatus');
-
-    flush();
-
-    assertFalse(!!manageProfile.shadowRoot.querySelector('#hasShortcutToggle'));
-  });
-});

chrome/test/data/webui/settings/people_page_manage_profile_test.ts

diff --git a/chrome/test/data/webui/settings/people_page_manage_profile_test.ts b/chrome/test/data/webui/settings/people_page_manage_profile_test.ts
new file mode 100644
index 0000000..51fd7c8
--- /dev/null
+++ b/chrome/test/data/webui/settings/people_page_manage_profile_test.ts
@@ -0,0 +1,280 @@
+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// clang-format off
+import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
+import {ManageProfileBrowserProxy, ManageProfileBrowserProxyImpl, ProfileShortcutStatus, SettingsManageProfileElement} from 'chrome://settings/lazy_load.js';
+import {CrToggleElement, loadTimeData, Router, routes, StatusAction} from 'chrome://settings/settings.js';
+import {assertEquals, assertFalse, assertTrue} from 'chrome://webui-test/chai_assert.js';
+import {TestBrowserProxy} from 'chrome://webui-test/test_browser_proxy.js';
+
+// clang-format on
+
+class TestManageProfileBrowserProxy extends TestBrowserProxy implements
+    ManageProfileBrowserProxy {
+  private profileShortcutStatus_: ProfileShortcutStatus =
+      ProfileShortcutStatus.PROFILE_SHORTCUT_FOUND;
+
+  constructor() {
+    super([
+      'getAvailableIcons',
+      'setProfileIconToGaiaAvatar',
+      'setProfileIconToDefaultAvatar',
+      'setProfileName',
+      'getProfileShortcutStatus',
+      'addProfileShortcut',
+      'removeProfileShortcut',
+    ]);
+  }
+
+  setProfileShortcutStatus(status: ProfileShortcutStatus) {
+    this.profileShortcutStatus_ = status;
+  }
+
+  getAvailableIcons() {
+    this.methodCalled('getAvailableIcons');
+    return Promise.resolve([
+      {
+        url: 'fake-icon-1.png',
+        label: 'fake-icon-1',
+        index: 1,
+        isGaiaAvatar: false,
+        selected: false,
+      },
+      {
+        url: 'fake-icon-2.png',
+        label: 'fake-icon-2',
+        index: 2,
+        selected: true,
+        isGaiaAvatar: false,
+      },
+      {
+        url: 'gaia-icon.png',
+        label: 'gaia-icon',
+        index: 3,
+        isGaiaAvatar: true,
+        selected: false,
+      },
+    ]);
+  }
+
+  setProfileIconToGaiaAvatar() {
+    this.methodCalled('setProfileIconToGaiaAvatar');
+  }
+
+  setProfileIconToDefaultAvatar(index: number) {
+    this.methodCalled('setProfileIconToDefaultAvatar', [index]);
+  }
+
+  setProfileName(name: string) {
+    this.methodCalled('setProfileName', [name]);
+  }
+
+  getProfileShortcutStatus() {
+    this.methodCalled('getProfileShortcutStatus');
+    return Promise.resolve(this.profileShortcutStatus_);
+  }
+
+  addProfileShortcut() {
+    this.methodCalled('addProfileShortcut');
+  }
+
+  removeProfileShortcut() {
+    this.methodCalled('removeProfileShortcut');
+  }
+}
+
+suite('ManageProfileTests', function() {
+  let manageProfile: SettingsManageProfileElement;
+  let browserProxy: TestManageProfileBrowserProxy;
+
+  setup(function() {
+    browserProxy = new TestManageProfileBrowserProxy();
+    ManageProfileBrowserProxyImpl.setInstance(browserProxy);
+    document.body.innerHTML = '';
+    loadTimeData.overrideValues({profileShortcutsEnabled: false});
+    manageProfile = createManageProfileElement();
+    Router.getInstance().navigateTo(routes.MANAGE_PROFILE);
+  });
+
+  teardown(function() {
+    manageProfile.remove();
+  });
+
+  function createManageProfileElement(): SettingsManageProfileElement {
+    const element = document.createElement('settings-manage-profile');
+    element.profileName = 'Initial Fake Name';
+    element.syncStatus = {
+      supervisedUser: false,
+      childUser: false,
+      statusAction: StatusAction.NO_ACTION,
+    };
+    document.body.appendChild(element);
+    return element;
+  }
+
+  // Tests that the manage profile subpage
+  //  - gets and receives all the available icons
+  //  - can select a new icon
+  test('ManageProfileChangeIcon', async function() {
+    let items = null;
+    await browserProxy.whenCalled('getAvailableIcons');
+    flush();
+    items =
+        manageProfile.shadowRoot!.querySelector(
+                                     'cr-profile-avatar-selector')!.shadowRoot!
+            .querySelector('#avatar-grid')!.querySelectorAll<HTMLElement>(
+                '.avatar');
+
+    assertEquals(3, items.length);
+    assertFalse(items[0]!.classList.contains('iron-selected'));
+    assertTrue(items[1]!.classList.contains('iron-selected'));
+    assertFalse(items[2]!.classList.contains('iron-selected'));
+
+    items[1]!.click();
+    const args = await browserProxy.whenCalled('setProfileIconToDefaultAvatar');
+    assertEquals(2, args[0]);
+
+    items[2]!.click();
+    await browserProxy.whenCalled('setProfileIconToGaiaAvatar');
+  });
+
+  test('ManageProfileChangeName', async function() {
+    const nameField = manageProfile.$.name;
+    assertTrue(!!nameField);
+    assertFalse(!!nameField.disabled);
+    assertEquals('.*\\S.*', nameField.pattern);
+
+    assertEquals('Initial Fake Name', nameField.value);
+
+    nameField.value = 'New Name';
+    nameField.fire('change');
+
+    const args = await browserProxy.whenCalled('setProfileName');
+    assertEquals('New Name', args[0]);
+  });
+
+  test('ProfileNameIsDisabledForSupervisedUser', function() {
+    manageProfile.syncStatus = {
+      supervisedUser: true,
+      childUser: false,
+      statusAction: StatusAction.NO_ACTION,
+    };
+
+    const nameField = manageProfile.$.name;
+    assertTrue(!!nameField);
+
+    // Name field should be disabled for legacy supervised users.
+    assertTrue(!!nameField.disabled);
+  });
+
+  // Tests profile name updates pushed from the browser.
+  test('ManageProfileNameUpdated', async function() {
+    const nameField = manageProfile.$.name;
+    assertTrue(!!nameField);
+
+    await browserProxy.whenCalled('getAvailableIcons');
+    manageProfile.profileName = 'New Name From Browser';
+
+    flush();
+
+    assertEquals('New Name From Browser', nameField.value);
+  });
+
+  // Tests that the theme selector is visible.
+  test('ProfileThemeSelector', function() {
+    assertTrue(!!manageProfile.shadowRoot!.querySelector('#themeSelector'));
+  });
+
+  // Tests profile shortcut toggle is hidden if profile shortcuts feature is
+  // disabled.
+  test('ManageProfileShortcutToggleHidden', function() {
+    const hasShortcutToggle =
+        manageProfile.shadowRoot!.querySelector('#hasShortcutToggle');
+    assertFalse(!!hasShortcutToggle);
+  });
+
+  // Tests profile shortcut toggle is visible and toggling it removes and
+  // creates the profile shortcut respectively.
+  test('ManageProfileShortcutToggle', async function() {
+    document.body.innerHTML = '';
+    loadTimeData.overrideValues({profileShortcutsEnabled: true});
+    manageProfile = createManageProfileElement();
+    flush();
+
+    assertFalse(
+        !!manageProfile.shadowRoot!.querySelector('#hasShortcutToggle'));
+    await browserProxy.whenCalled('getProfileShortcutStatus');
+
+    flush();
+
+    const hasShortcutToggle =
+        manageProfile.shadowRoot!.querySelector<CrToggleElement>(
+            '#hasShortcutToggle');
+    assertTrue(!!hasShortcutToggle);
+
+    // The profile shortcut toggle is checked.
+    assertTrue(hasShortcutToggle!.checked);
+
+    // Simulate tapping the profile shortcut toggle.
+    hasShortcutToggle!.click();
+    await browserProxy.whenCalled('removeProfileShortcut');
+
+    flush();
+
+    // The profile shortcut toggle is checked.
+    assertFalse(hasShortcutToggle!.checked);
+
+    // Simulate tapping the profile shortcut toggle.
+    hasShortcutToggle!.click();
+    await browserProxy.whenCalled('addProfileShortcut');
+  });
+
+  // Tests profile shortcut toggle is visible and toggled off when no
+  // profile shortcut is found.
+  test('ManageProfileShortcutToggleShortcutNotFound', async function() {
+    browserProxy.setProfileShortcutStatus(
+        ProfileShortcutStatus.PROFILE_SHORTCUT_NOT_FOUND);
+
+    document.body.innerHTML = '';
+    loadTimeData.overrideValues({profileShortcutsEnabled: true});
+    manageProfile = createManageProfileElement();
+    flush();
+
+    assertFalse(
+        !!manageProfile.shadowRoot!.querySelector('#hasShortcutToggle'));
+    await browserProxy.whenCalled('getProfileShortcutStatus');
+
+    flush();
+
+    const hasShortcutToggle =
+        manageProfile.shadowRoot!.querySelector<CrToggleElement>(
+            '#hasShortcutToggle');
+    assertTrue(!!hasShortcutToggle);
+
+    assertFalse(hasShortcutToggle!.checked);
+  });
+
+  // Tests the case when the profile shortcut setting is hidden. This can
+  // occur in the single profile case.
+  test('ManageProfileShortcutSettingHidden', async function() {
+    browserProxy.setProfileShortcutStatus(
+        ProfileShortcutStatus.PROFILE_SHORTCUT_SETTING_HIDDEN);
+
+    document.body.innerHTML = '';
+    loadTimeData.overrideValues({profileShortcutsEnabled: true});
+    manageProfile = createManageProfileElement();
+    flush();
+
+    assertFalse(
+        !!manageProfile.shadowRoot!.querySelector('#hasShortcutToggle'));
+
+    await browserProxy.whenCalled('getProfileShortcutStatus');
+
+    flush();
+
+    assertFalse(
+        !!manageProfile.shadowRoot!.querySelector('#hasShortcutToggle'));
+  });
+});

chrome/test/data/webui/settings/people_page_test.js

diff --git a/chrome/test/data/webui/settings/people_page_test.js b/chrome/test/data/webui/settings/people_page_test.js
deleted file mode 100644
index e885ff1..0000000
--- a/chrome/test/data/webui/settings/people_page_test.js
+++ /dev/null
@@ -1,449 +0,0 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// clang-format off
-import 'chrome://settings/lazy_load.js';
-
-import {isChromeOS, webUIListenerCallback} from 'chrome://resources/js/cr.m.js';
-import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js';
-import {listenOnce} from 'chrome://resources/js/util.m.js';
-import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
-import {pageVisibility, ProfileInfoBrowserProxyImpl, Router, routes, StatusAction, SyncBrowserProxyImpl} from 'chrome://settings/settings.js';
-import {TestBrowserProxy} from 'chrome://webui-test/test_browser_proxy.js';
-import {flushTasks, waitBeforeNextRender} from 'chrome://webui-test/test_util.js';
-
-import {simulateStoredAccounts, simulateSyncStatus} from './sync_test_util.js';
-import {TestProfileInfoBrowserProxy} from './test_profile_info_browser_proxy.js';
-import {TestSyncBrowserProxy} from './test_sync_browser_proxy.js';
-// clang-format on
-
-/** @implements {settings.PeopleBrowserProxy} */
-class TestPeopleBrowserProxy extends TestBrowserProxy {
-  constructor() {
-    super([
-      'openURL',
-    ]);
-  }
-
-  /** @override */
-  openURL(url) {
-    this.methodCalled('openURL', url);
-  }
-}
-
-/** @type {?SettingsPeoplePageElement} */
-let peoplePage = null;
-/** @type {?ProfileInfoBrowserProxy} */
-let profileInfoBrowserProxy = null;
-/** @type {?SyncBrowserProxy} */
-let syncBrowserProxy = null;
-
-suite('ProfileInfoTests', function() {
-  suiteSetup(function() {
-    if (isChromeOS) {
-      loadTimeData.overrideValues({
-        // Account Manager is tested in the Chrome OS-specific section below.
-        isAccountManagerEnabled: false,
-      });
-    }
-  });
-
-  setup(async function() {
-    profileInfoBrowserProxy = new TestProfileInfoBrowserProxy();
-    ProfileInfoBrowserProxyImpl.setInstance(profileInfoBrowserProxy);
-
-    syncBrowserProxy = new TestSyncBrowserProxy();
-    SyncBrowserProxyImpl.setInstance(syncBrowserProxy);
-
-    PolymerTest.clearBody();
-    peoplePage = document.createElement('settings-people-page');
-    peoplePage.pageVisibility = pageVisibility;
-    document.body.appendChild(peoplePage);
-
-    await syncBrowserProxy.whenCalled('getSyncStatus');
-    await profileInfoBrowserProxy.whenCalled('getProfileInfo');
-    flush();
-  });
-
-  teardown(function() {
-    peoplePage.remove();
-  });
-
-  test('GetProfileInfo', function() {
-    assertEquals(
-        profileInfoBrowserProxy.fakeProfileInfo.name,
-        peoplePage.shadowRoot.querySelector('#profile-name')
-            .textContent.trim());
-    const bg = peoplePage.shadowRoot.querySelector('#profile-icon')
-                   .style.backgroundImage;
-    assertTrue(bg.includes(profileInfoBrowserProxy.fakeProfileInfo.iconUrl));
-
-    const iconDataUrl = 'data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEA' +
-        'LAAAAAABAAEAAAICTAEAOw==';
-    webUIListenerCallback(
-        'profile-info-changed', {name: 'pushedName', iconUrl: iconDataUrl});
-
-    flush();
-    assertEquals(
-        'pushedName',
-        peoplePage.shadowRoot.querySelector('#profile-name')
-            .textContent.trim());
-    const newBg = peoplePage.shadowRoot.querySelector('#profile-icon')
-                      .style.backgroundImage;
-    assertTrue(newBg.includes(iconDataUrl));
-  });
-});
-
-if (!isChromeOS) {
-  suite('SigninDisallowedTests', function() {
-    setup(function() {
-      loadTimeData.overrideValues({signinAllowed: false});
-
-      syncBrowserProxy = new TestSyncBrowserProxy();
-      SyncBrowserProxyImpl.setInstance(syncBrowserProxy);
-
-      profileInfoBrowserProxy = new TestProfileInfoBrowserProxy();
-      ProfileInfoBrowserProxyImpl.setInstance(profileInfoBrowserProxy);
-
-      PolymerTest.clearBody();
-      peoplePage = document.createElement('settings-people-page');
-      peoplePage.pageVisibility = pageVisibility;
-      document.body.appendChild(peoplePage);
-    });
-
-    teardown(function() {
-      peoplePage.remove();
-    });
-
-    test('ShowCorrectRows', async function() {
-      await syncBrowserProxy.whenCalled('getSyncStatus');
-      flush();
-
-      // The correct /manageProfile link row is shown.
-      assertFalse(!!peoplePage.shadowRoot.querySelector('#edit-profile'));
-      assertTrue(!!peoplePage.shadowRoot.querySelector('#profile-row'));
-
-      // Control element doesn't exist when policy forbids sync.
-      simulateSyncStatus({
-        signedIn: false,
-        syncSystemEnabled: true,
-      });
-      assertFalse(!!peoplePage.shadowRoot.querySelector(
-          'settings-sync-account-control'));
-    });
-  });
-
-  suite('SyncStatusTests', function() {
-    setup(async function() {
-      loadTimeData.overrideValues({signinAllowed: true});
-      syncBrowserProxy = new TestSyncBrowserProxy();
-      SyncBrowserProxyImpl.setInstance(syncBrowserProxy);
-
-      profileInfoBrowserProxy = new TestProfileInfoBrowserProxy();
-      ProfileInfoBrowserProxyImpl.setInstance(profileInfoBrowserProxy);
-
-      PolymerTest.clearBody();
-      peoplePage = document.createElement('settings-people-page');
-      peoplePage.pageVisibility = pageVisibility;
-      document.body.appendChild(peoplePage);
-    });
-
-    teardown(function() {
-      peoplePage.remove();
-    });
-
-    test('Toast', function() {
-      assertFalse(peoplePage.$.toast.open);
-      webUIListenerCallback('sync-settings-saved');
-      assertTrue(peoplePage.$.toast.open);
-    });
-
-    test('ShowCorrectRows', async function() {
-      await syncBrowserProxy.whenCalled('getSyncStatus');
-      simulateSyncStatus({
-        syncSystemEnabled: true,
-      });
-      flush();
-
-      // The correct /manageProfile link row is shown.
-      assertTrue(!!peoplePage.shadowRoot.querySelector('#edit-profile'));
-      assertFalse(!!peoplePage.shadowRoot.querySelector('#profile-row'));
-
-      simulateSyncStatus({
-        signedIn: false,
-        syncSystemEnabled: true,
-      });
-
-      // The control element should exist when policy allows.
-      const accountControl =
-          peoplePage.shadowRoot.querySelector('settings-sync-account-control');
-      assertTrue(window.getComputedStyle(accountControl)['display'] !== 'none');
-
-      // Control element doesn't exist when policy forbids sync.
-      simulateSyncStatus({
-        syncSystemEnabled: false,
-      });
-      assertEquals('none', window.getComputedStyle(accountControl)['display']);
-
-      const manageGoogleAccount =
-          peoplePage.shadowRoot.querySelector('#manage-google-account');
-
-      // Do not show Google Account when stored accounts or sync status
-      // could not be retrieved.
-      simulateStoredAccounts(undefined);
-      simulateSyncStatus(undefined);
-      assertEquals(
-          'none', window.getComputedStyle(manageGoogleAccount)['display']);
-
-      simulateStoredAccounts([]);
-      simulateSyncStatus(undefined);
-      assertEquals(
-          'none', window.getComputedStyle(manageGoogleAccount)['display']);
-
-      simulateStoredAccounts(undefined);
-      simulateSyncStatus({});
-      assertEquals(
-          'none', window.getComputedStyle(manageGoogleAccount)['display']);
-
-      simulateStoredAccounts([]);
-      simulateSyncStatus({});
-      assertEquals(
-          'none', window.getComputedStyle(manageGoogleAccount)['display']);
-
-      // A stored account with sync off but no error should result in the
-      // Google Account being shown.
-      simulateStoredAccounts([{email: 'foo@foo.com'}]);
-      simulateSyncStatus({
-        signedIn: false,
-        hasError: false,
-      });
-      assertTrue(
-          window.getComputedStyle(manageGoogleAccount)['display'] !== 'none');
-
-      // A stored account with sync off and error should not result in the
-      // Google Account being shown.
-      simulateStoredAccounts([{email: 'foo@foo.com'}]);
-      simulateSyncStatus({
-        signedIn: false,
-        hasError: true,
-      });
-      assertEquals(
-          'none', window.getComputedStyle(manageGoogleAccount)['display']);
-
-      // A stored account with sync on but no error should result in the
-      // Google Account being shown.
-      simulateStoredAccounts([{email: 'foo@foo.com'}]);
-      simulateSyncStatus({
-        signedIn: true,
-        hasError: false,
-      });
-      assertTrue(
-          window.getComputedStyle(manageGoogleAccount)['display'] !== 'none');
-
-      // A stored account with sync on but with error should not result in
-      // the Google Account being shown.
-      simulateStoredAccounts([{email: 'foo@foo.com'}]);
-      simulateSyncStatus({
-        signedIn: true,
-        hasError: true,
-      });
-      assertEquals(
-          'none', window.getComputedStyle(manageGoogleAccount)['display']);
-    });
-
-    test('SignOutNavigationNormalProfile', async function() {
-      // Navigate to chrome://settings/signOut
-      Router.getInstance().navigateTo(routes.SIGN_OUT);
-
-      await flushTasks();
-      const signoutDialog =
-          peoplePage.shadowRoot.querySelector('settings-signout-dialog');
-      assertTrue(signoutDialog.shadowRoot.querySelector('#dialog').open);
-      assertFalse(
-          signoutDialog.shadowRoot.querySelector('#deleteProfile').hidden);
-
-      const deleteProfileCheckbox =
-          signoutDialog.shadowRoot.querySelector('#deleteProfile');
-      assertTrue(!!deleteProfileCheckbox);
-      assertLT(0, deleteProfileCheckbox.clientHeight);
-
-      const disconnectConfirm =
-          signoutDialog.shadowRoot.querySelector('#disconnectConfirm');
-      assertTrue(!!disconnectConfirm);
-      assertFalse(disconnectConfirm.hidden);
-
-      disconnectConfirm.click();
-
-      await new Promise(function(resolve) {
-        listenOnce(window, 'popstate', resolve);
-      });
-      const deleteProfile = await syncBrowserProxy.whenCalled('signOut');
-      assertFalse(deleteProfile);
-    });
-
-    test('SignOutDialogManagedProfile', async function() {
-      let accountControl = null;
-      await syncBrowserProxy.whenCalled('getSyncStatus');
-      simulateSyncStatus({
-        signedIn: true,
-        domain: 'example.com',
-        syncSystemEnabled: true,
-      });
-
-      assertFalse(!!peoplePage.shadowRoot.querySelector('#dialog'));
-      accountControl =
-          peoplePage.shadowRoot.querySelector('settings-sync-account-control');
-      await waitBeforeNextRender(accountControl);
-      const turnOffButton =
-          accountControl.shadowRoot.querySelector('#turn-off');
-      turnOffButton.click();
-      flush();
-
-      await flushTasks();
-      const signoutDialog =
-          peoplePage.shadowRoot.querySelector('settings-signout-dialog');
-      assertTrue(signoutDialog.shadowRoot.querySelector('#dialog').open);
-      assertFalse(!!signoutDialog.shadowRoot.querySelector('#deleteProfile'));
-
-      const disconnectManagedProfileConfirm =
-          signoutDialog.shadowRoot.querySelector(
-              '#disconnectManagedProfileConfirm');
-      assertTrue(!!disconnectManagedProfileConfirm);
-      assertFalse(disconnectManagedProfileConfirm.hidden);
-
-      syncBrowserProxy.resetResolver('signOut');
-
-
-      disconnectManagedProfileConfirm.click();
-
-      await new Promise(function(resolve) {
-        listenOnce(window, 'popstate', resolve);
-      });
-      const deleteProfile = await syncBrowserProxy.whenCalled('signOut');
-      assertTrue(deleteProfile);
-    });
-
-    test('getProfileStatsCount', async function() {
-      // Navigate to chrome://settings/signOut
-      Router.getInstance().navigateTo(routes.SIGN_OUT);
-
-      await flushTasks();
-      const signoutDialog =
-          peoplePage.shadowRoot.querySelector('settings-signout-dialog');
-      assertTrue(signoutDialog.shadowRoot.querySelector('#dialog').open);
-
-      // Assert the warning message is as expected.
-      const warningMessage =
-          signoutDialog.shadowRoot.querySelector('.delete-profile-warning');
-
-      webUIListenerCallback('profile-stats-count-ready', 0);
-      assertEquals(
-          loadTimeData.getStringF(
-              'deleteProfileWarningWithoutCounts', 'fakeUsername'),
-          warningMessage.textContent.trim());
-
-      webUIListenerCallback('profile-stats-count-ready', 1);
-      assertEquals(
-          loadTimeData.getStringF(
-              'deleteProfileWarningWithCountsSingular', 'fakeUsername'),
-          warningMessage.textContent.trim());
-
-      webUIListenerCallback('profile-stats-count-ready', 2);
-      assertEquals(
-          loadTimeData.getStringF(
-              'deleteProfileWarningWithCountsPlural', 2, 'fakeUsername'),
-          warningMessage.textContent.trim());
-
-      // Close the disconnect dialog.
-      signoutDialog.shadowRoot.querySelector('#disconnectConfirm').click();
-      await new Promise(function(resolve) {
-        listenOnce(window, 'popstate', resolve);
-      });
-    });
-
-    test('NavigateDirectlyToSignOutURL', async function() {
-      // Navigate to chrome://settings/signOut
-      Router.getInstance().navigateTo(routes.SIGN_OUT);
-
-      await flushTasks();
-      assertTrue(peoplePage.shadowRoot.querySelector('settings-signout-dialog')
-                     .shadowRoot.querySelector('#dialog')
-                     .open);
-      await profileInfoBrowserProxy.whenCalled('getProfileStatsCount');
-      // 'getProfileStatsCount' can be the first message sent to the
-      // handler if the user navigates directly to
-      // chrome://settings/signOut. if so, it should not cause a crash.
-      new ProfileInfoBrowserProxyImpl().getProfileStatsCount();
-
-      // Close the disconnect dialog.
-      peoplePage.shadowRoot.querySelector('settings-signout-dialog')
-          .shadowRoot.querySelector('#disconnectConfirm')
-          .click();
-      await new Promise(function(resolve) {
-        listenOnce(window, 'popstate', resolve);
-      });
-    });
-
-    test('Signout dialog suppressed when not signed in', async function() {
-      await syncBrowserProxy.whenCalled('getSyncStatus');
-      Router.getInstance().navigateTo(routes.SIGN_OUT);
-      await flushTasks();
-      assertTrue(peoplePage.shadowRoot.querySelector('settings-signout-dialog')
-                     .shadowRoot.querySelector('#dialog')
-                     .open);
-
-      simulateSyncStatus({
-        signedIn: false,
-      });
-
-      await new Promise(function(resolve) {
-        listenOnce(window, 'popstate', resolve);
-      });
-
-      Router.getInstance().navigateTo(routes.SIGN_OUT);
-
-      await new Promise(function(resolve) {
-        listenOnce(window, 'popstate', resolve);
-      });
-    });
-  });
-}
-
-suite('SyncSettings', function() {
-  setup(async function() {
-    syncBrowserProxy = new TestSyncBrowserProxy();
-    SyncBrowserProxyImpl.setInstance(syncBrowserProxy);
-
-    profileInfoBrowserProxy = new TestProfileInfoBrowserProxy();
-    ProfileInfoBrowserProxyImpl.setInstance(profileInfoBrowserProxy);
-
-    PolymerTest.clearBody();
-    peoplePage = document.createElement('settings-people-page');
-    peoplePage.pageVisibility = pageVisibility;
-    document.body.appendChild(peoplePage);
-
-    await syncBrowserProxy.whenCalled('getSyncStatus');
-    flush();
-  });
-
-  teardown(function() {
-    peoplePage.remove();
-  });
-
-  test('ShowCorrectSyncRow', function() {
-    assertTrue(!!peoplePage.shadowRoot.querySelector('#sync-setup'));
-    assertFalse(!!peoplePage.shadowRoot.querySelector('#sync-status'));
-
-    // Make sures the subpage opens even when logged out or has errors.
-    simulateSyncStatus({
-      signedIn: false,
-      statusAction: StatusAction.REAUTHENTICATE,
-    });
-
-    peoplePage.shadowRoot.querySelector('#sync-setup').click();
-    flush();
-
-    assertEquals(Router.getInstance().getCurrentRoute(), routes.SYNC);
-  });
-});

chrome/test/data/webui/settings/people_page_test.ts

diff --git a/chrome/test/data/webui/settings/people_page_test.ts b/chrome/test/data/webui/settings/people_page_test.ts
new file mode 100644
index 0000000..8cdaa49
--- /dev/null
+++ b/chrome/test/data/webui/settings/people_page_test.ts
@@ -0,0 +1,465 @@
+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// clang-format off
+import 'chrome://settings/lazy_load.js';
+
+import {webUIListenerCallback} from 'chrome://resources/js/cr.m.js';
+// <if expr="not chromeos and not lacros">
+import {listenOnce} from 'chrome://resources/js/util.m.js';
+// </if>
+
+import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
+// <if expr="not chromeos and not lacros">
+import {CrCheckboxElement} from 'chrome://settings/lazy_load.js';
+// </if>
+
+// <if expr="not lacros">
+import {loadTimeData} from 'chrome://settings/settings.js';
+// </if>
+
+import {pageVisibility, ProfileInfoBrowserProxyImpl, Router, routes, SettingsPeoplePageElement, StatusAction, SyncBrowserProxyImpl} from 'chrome://settings/settings.js';
+import {assertEquals, assertFalse, assertTrue} from 'chrome://webui-test/chai_assert.js';
+// <if expr="not chromeos and not lacros">
+import {assertLT} from 'chrome://webui-test/chai_assert.js';
+import {flushTasks, waitBeforeNextRender} from 'chrome://webui-test/test_util.js';
+
+// </if>
+
+import {simulateSyncStatus} from './sync_test_util.js';
+// <if expr="not chromeos and not lacros">
+import {simulateStoredAccounts} from './sync_test_util.js';
+// </if>
+
+import {TestProfileInfoBrowserProxy} from './test_profile_info_browser_proxy.js';
+import {TestSyncBrowserProxy} from './test_sync_browser_proxy.js';
+
+// clang-format on
+
+let peoplePage: SettingsPeoplePageElement;
+let profileInfoBrowserProxy: TestProfileInfoBrowserProxy;
+let syncBrowserProxy: TestSyncBrowserProxy;
+
+suite('ProfileInfoTests', function() {
+  suiteSetup(function() {
+    // <if expr="chromeos">
+    loadTimeData.overrideValues({
+      // Account Manager is tested in people_page_test_cros.js
+      isAccountManagerEnabled: false,
+    });
+    // </if>
+  });
+
+  setup(async function() {
+    profileInfoBrowserProxy = new TestProfileInfoBrowserProxy();
+    ProfileInfoBrowserProxyImpl.setInstance(profileInfoBrowserProxy);
+
+    syncBrowserProxy = new TestSyncBrowserProxy();
+    SyncBrowserProxyImpl.setInstance(syncBrowserProxy);
+
+    document.body.innerHTML = '';
+    peoplePage = document.createElement('settings-people-page');
+    peoplePage.pageVisibility = pageVisibility;
+    document.body.appendChild(peoplePage);
+
+    await syncBrowserProxy.whenCalled('getSyncStatus');
+    await profileInfoBrowserProxy.whenCalled('getProfileInfo');
+    flush();
+  });
+
+  teardown(function() {
+    peoplePage.remove();
+  });
+
+  test('GetProfileInfo', function() {
+    assertEquals(
+        profileInfoBrowserProxy.fakeProfileInfo.name,
+        peoplePage.shadowRoot!.querySelector<HTMLElement>(
+                                  '#profile-name')!.textContent!.trim());
+    const bg =
+        peoplePage.shadowRoot!.querySelector<HTMLElement>(
+                                  '#profile-icon')!.style.backgroundImage;
+    assertTrue(bg.includes(profileInfoBrowserProxy.fakeProfileInfo.iconUrl));
+
+    const iconDataUrl = 'data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEA' +
+        'LAAAAAABAAEAAAICTAEAOw==';
+    webUIListenerCallback(
+        'profile-info-changed', {name: 'pushedName', iconUrl: iconDataUrl});
+
+    flush();
+    assertEquals(
+        'pushedName',
+        peoplePage.shadowRoot!.querySelector<HTMLElement>(
+                                  '#profile-name')!.textContent!.trim());
+    const newBg =
+        peoplePage.shadowRoot!.querySelector<HTMLElement>(
+                                  '#profile-icon')!.style.backgroundImage;
+    assertTrue(newBg.includes(iconDataUrl));
+  });
+});
+
+// <if expr="not chromeos and not lacros">
+suite('SigninDisallowedTests', function() {
+  setup(function() {
+    loadTimeData.overrideValues({signinAllowed: false});
+
+    syncBrowserProxy = new TestSyncBrowserProxy();
+    SyncBrowserProxyImpl.setInstance(syncBrowserProxy);
+
+    profileInfoBrowserProxy = new TestProfileInfoBrowserProxy();
+    ProfileInfoBrowserProxyImpl.setInstance(profileInfoBrowserProxy);
+
+    document.body.innerHTML = '';
+    peoplePage = document.createElement('settings-people-page');
+    peoplePage.pageVisibility = pageVisibility;
+    document.body.appendChild(peoplePage);
+  });
+
+  teardown(function() {
+    peoplePage.remove();
+  });
+
+  test('ShowCorrectRows', async function() {
+    await syncBrowserProxy.whenCalled('getSyncStatus');
+    flush();
+
+    // The correct /manageProfile link row is shown.
+    assertFalse(!!peoplePage.shadowRoot!.querySelector('#edit-profile'));
+    assertTrue(!!peoplePage.shadowRoot!.querySelector('#profile-row'));
+
+    // Control element doesn't exist when policy forbids sync.
+    simulateSyncStatus({
+      signedIn: false,
+      syncSystemEnabled: true,
+      statusAction: StatusAction.NO_ACTION,
+    });
+    assertFalse(!!peoplePage.shadowRoot!.querySelector(
+        'settings-sync-account-control'));
+  });
+});
+
+suite('SyncStatusTests', function() {
+  setup(async function() {
+    loadTimeData.overrideValues({signinAllowed: true});
+    syncBrowserProxy = new TestSyncBrowserProxy();
+    SyncBrowserProxyImpl.setInstance(syncBrowserProxy);
+
+    profileInfoBrowserProxy = new TestProfileInfoBrowserProxy();
+    ProfileInfoBrowserProxyImpl.setInstance(profileInfoBrowserProxy);
+
+    document.body.innerHTML = '';
+    peoplePage = document.createElement('settings-people-page');
+    peoplePage.pageVisibility = pageVisibility;
+    document.body.appendChild(peoplePage);
+  });
+
+  teardown(function() {
+    peoplePage.remove();
+  });
+
+  test('Toast', function() {
+    assertFalse(peoplePage.$.toast.open);
+    webUIListenerCallback('sync-settings-saved');
+    assertTrue(peoplePage.$.toast.open);
+  });
+
+  test('ShowCorrectRows', async function() {
+    await syncBrowserProxy.whenCalled('getSyncStatus');
+    simulateSyncStatus({
+      syncSystemEnabled: true,
+      statusAction: StatusAction.NO_ACTION,
+    });
+    flush();
+
+    // The correct /manageProfile link row is shown.
+    assertTrue(!!peoplePage.shadowRoot!.querySelector('#edit-profile'));
+    assertFalse(!!peoplePage.shadowRoot!.querySelector('#profile-row'));
+
+    simulateSyncStatus({
+      signedIn: false,
+      syncSystemEnabled: true,
+      statusAction: StatusAction.NO_ACTION,
+    });
+
+    // The control element should exist when policy allows.
+    const accountControl =
+        peoplePage.shadowRoot!.querySelector('settings-sync-account-control')!;
+    assertTrue(window.getComputedStyle(accountControl)['display'] !== 'none');
+
+    // Control element doesn't exist when policy forbids sync.
+    simulateSyncStatus({
+      syncSystemEnabled: false,
+      statusAction: StatusAction.NO_ACTION,
+    });
+    assertEquals('none', window.getComputedStyle(accountControl)['display']);
+
+    const manageGoogleAccount =
+        peoplePage.shadowRoot!.querySelector('#manage-google-account')!;
+
+    // Do not show Google Account when stored accounts or sync status
+    // could not be retrieved.
+    simulateStoredAccounts(undefined);
+    simulateSyncStatus(undefined);
+    assertEquals(
+        'none', window.getComputedStyle(manageGoogleAccount)['display']);
+
+    simulateStoredAccounts([]);
+    simulateSyncStatus(undefined);
+    assertEquals(
+        'none', window.getComputedStyle(manageGoogleAccount)['display']);
+
+    simulateStoredAccounts(undefined);
+    simulateSyncStatus({
+      statusAction: StatusAction.NO_ACTION,
+    });
+    assertEquals(
+        'none', window.getComputedStyle(manageGoogleAccount)['display']);
+
+    simulateStoredAccounts([]);
+    simulateSyncStatus({
+      statusAction: StatusAction.NO_ACTION,
+    });
+    assertEquals(
+        'none', window.getComputedStyle(manageGoogleAccount)['display']);
+
+    // A stored account with sync off but no error should result in the
+    // Google Account being shown.
+    simulateStoredAccounts([{email: 'foo@foo.com'}]);
+    simulateSyncStatus({
+      signedIn: false,
+      hasError: false,
+      statusAction: StatusAction.NO_ACTION,
+    });
+    assertTrue(
+        window.getComputedStyle(manageGoogleAccount)['display'] !== 'none');
+
+    // A stored account with sync off and error should not result in the
+    // Google Account being shown.
+    simulateStoredAccounts([{email: 'foo@foo.com'}]);
+    simulateSyncStatus({
+      signedIn: false,
+      hasError: true,
+      statusAction: StatusAction.NO_ACTION,
+    });
+    assertEquals(
+        'none', window.getComputedStyle(manageGoogleAccount)['display']);
+
+    // A stored account with sync on but no error should result in the
+    // Google Account being shown.
+    simulateStoredAccounts([{email: 'foo@foo.com'}]);
+    simulateSyncStatus({
+      signedIn: true,
+      hasError: false,
+      statusAction: StatusAction.NO_ACTION,
+    });
+    assertTrue(
+        window.getComputedStyle(manageGoogleAccount)['display'] !== 'none');
+
+    // A stored account with sync on but with error should not result in
+    // the Google Account being shown.
+    simulateStoredAccounts([{email: 'foo@foo.com'}]);
+    simulateSyncStatus({
+      signedIn: true,
+      hasError: true,
+      statusAction: StatusAction.NO_ACTION,
+    });
+    assertEquals(
+        'none', window.getComputedStyle(manageGoogleAccount)['display']);
+  });
+
+  test('SignOutNavigationNormalProfile', async function() {
+    // Navigate to chrome://settings/signOut
+    Router.getInstance().navigateTo(routes.SIGN_OUT);
+
+    await flushTasks();
+    const signoutDialog =
+        peoplePage.shadowRoot!.querySelector('settings-signout-dialog')!;
+    assertTrue(signoutDialog.$.dialog.open);
+    const deleteProfileCheckbox =
+        signoutDialog.shadowRoot!.querySelector<CrCheckboxElement>(
+            '#deleteProfile');
+    assertTrue(!!deleteProfileCheckbox);
+    assertFalse(deleteProfileCheckbox!.hidden);
+
+    assertLT(0, deleteProfileCheckbox!.clientHeight);
+
+    const disconnectConfirm = signoutDialog.$.disconnectConfirm;
+    assertTrue(!!disconnectConfirm);
+    assertFalse(disconnectConfirm.hidden);
+
+    disconnectConfirm.click();
+
+    await new Promise(function(resolve) {
+      listenOnce(window, 'popstate', resolve);
+    });
+    const deleteProfile = await syncBrowserProxy.whenCalled('signOut');
+    assertFalse(deleteProfile);
+  });
+
+  test('SignOutDialogManagedProfile', async function() {
+    let accountControl = null;
+    await syncBrowserProxy.whenCalled('getSyncStatus');
+    simulateSyncStatus({
+      signedIn: true,
+      domain: 'example.com',
+      syncSystemEnabled: true,
+      statusAction: StatusAction.NO_ACTION,
+    });
+
+    assertFalse(!!peoplePage.shadowRoot!.querySelector('#dialog'));
+    accountControl =
+        peoplePage.shadowRoot!.querySelector('settings-sync-account-control')!;
+    await waitBeforeNextRender(accountControl);
+    const turnOffButton =
+        accountControl.shadowRoot!.querySelector<HTMLElement>('#turn-off')!;
+    turnOffButton.click();
+    flush();
+
+    await flushTasks();
+    const signoutDialog =
+        peoplePage.shadowRoot!.querySelector('settings-signout-dialog')!;
+    assertTrue(signoutDialog.$.dialog.open);
+    assertFalse(!!signoutDialog.shadowRoot!.querySelector('#deleteProfile'));
+
+    const disconnectManagedProfileConfirm =
+        signoutDialog.shadowRoot!.querySelector<HTMLElement>(
+            '#disconnectManagedProfileConfirm');
+    assertTrue(!!disconnectManagedProfileConfirm);
+    assertFalse(disconnectManagedProfileConfirm!.hidden);
+
+    syncBrowserProxy.resetResolver('signOut');
+
+
+    disconnectManagedProfileConfirm!.click();
+
+    await new Promise(function(resolve) {
+      listenOnce(window, 'popstate', resolve);
+    });
+    const deleteProfile = await syncBrowserProxy.whenCalled('signOut');
+    assertTrue(deleteProfile);
+  });
+
+  test('getProfileStatsCount', async function() {
+    // Navigate to chrome://settings/signOut
+    Router.getInstance().navigateTo(routes.SIGN_OUT);
+
+    await flushTasks();
+    const signoutDialog =
+        peoplePage.shadowRoot!.querySelector('settings-signout-dialog')!;
+    assertTrue(signoutDialog.$.dialog.open);
+
+    // Assert the warning message is as expected.
+    const warningMessage = signoutDialog.shadowRoot!.querySelector<HTMLElement>(
+        '.delete-profile-warning')!;
+
+    webUIListenerCallback('profile-stats-count-ready', 0);
+    assertEquals(
+        loadTimeData.getStringF(
+            'deleteProfileWarningWithoutCounts', 'fakeUsername'),
+        warningMessage.textContent!.trim());
+
+    webUIListenerCallback('profile-stats-count-ready', 1);
+    assertEquals(
+        loadTimeData.getStringF(
+            'deleteProfileWarningWithCountsSingular', 'fakeUsername'),
+        warningMessage.textContent!.trim());
+
+    webUIListenerCallback('profile-stats-count-ready', 2);
+    assertEquals(
+        loadTimeData.getStringF(
+            'deleteProfileWarningWithCountsPlural', 2, 'fakeUsername'),
+        warningMessage.textContent!.trim());
+
+    // Close the disconnect dialog.
+    signoutDialog.$.disconnectConfirm.click();
+    await new Promise(function(resolve) {
+      listenOnce(window, 'popstate', resolve);
+    });
+  });
+
+  test('NavigateDirectlyToSignOutURL', async function() {
+    // Navigate to chrome://settings/signOut
+    Router.getInstance().navigateTo(routes.SIGN_OUT);
+
+    await flushTasks();
+    assertTrue(
+        peoplePage.shadowRoot!.querySelector(
+                                  'settings-signout-dialog')!.$.dialog.open);
+    await profileInfoBrowserProxy.whenCalled('getProfileStatsCount');
+    // 'getProfileStatsCount' can be the first message sent to the
+    // handler if the user navigates directly to
+    // chrome://settings/signOut. if so, it should not cause a crash.
+    new ProfileInfoBrowserProxyImpl().getProfileStatsCount();
+
+    // Close the disconnect dialog.
+    peoplePage.shadowRoot!.querySelector('settings-signout-dialog')!.$
+        .disconnectConfirm.click();
+    await new Promise(function(resolve) {
+      listenOnce(window, 'popstate', resolve);
+    });
+  });
+
+  test('Signout dialog suppressed when not signed in', async function() {
+    await syncBrowserProxy.whenCalled('getSyncStatus');
+    Router.getInstance().navigateTo(routes.SIGN_OUT);
+    await flushTasks();
+    assertTrue(
+        peoplePage.shadowRoot!.querySelector(
+                                  'settings-signout-dialog')!.$.dialog.open);
+
+    simulateSyncStatus({
+      signedIn: false,
+      statusAction: StatusAction.NO_ACTION,
+    });
+
+    await new Promise(function(resolve) {
+      listenOnce(window, 'popstate', resolve);
+    });
+
+    Router.getInstance().navigateTo(routes.SIGN_OUT);
+
+    await new Promise(function(resolve) {
+      listenOnce(window, 'popstate', resolve);
+    });
+  });
+});
+// </if>
+
+suite('SyncSettings', function() {
+  setup(async function() {
+    syncBrowserProxy = new TestSyncBrowserProxy();
+    SyncBrowserProxyImpl.setInstance(syncBrowserProxy);
+
+    profileInfoBrowserProxy = new TestProfileInfoBrowserProxy();
+    ProfileInfoBrowserProxyImpl.setInstance(profileInfoBrowserProxy);
+
+    document.body.innerHTML = '';
+    peoplePage = document.createElement('settings-people-page');
+    peoplePage.pageVisibility = pageVisibility;
+    document.body.appendChild(peoplePage);
+
+    await syncBrowserProxy.whenCalled('getSyncStatus');
+    flush();
+  });
+
+  teardown(function() {
+    peoplePage.remove();
+  });
+
+  test('ShowCorrectSyncRow', function() {
+    assertTrue(!!peoplePage.shadowRoot!.querySelector('#sync-setup'));
+    assertFalse(!!peoplePage.shadowRoot!.querySelector('#sync-status'));
+
+    // Make sures the subpage opens even when logged out or has errors.
+    simulateSyncStatus({
+      signedIn: false,
+      statusAction: StatusAction.REAUTHENTICATE,
+    });
+
+    peoplePage.shadowRoot!.querySelector<HTMLElement>('#sync-setup')!.click();
+    flush();
+
+    assertEquals(Router.getInstance().getCurrentRoute(), routes.SYNC);
+  });
+});

chrome/test/data/webui/settings/people_page_test_cros.js

diff --git a/chrome/test/data/webui/settings/people_page_test_cros.js b/chrome/test/data/webui/settings/people_page_test_cros.js
deleted file mode 100644
index 16aadf8fd..0000000
--- a/chrome/test/data/webui/settings/people_page_test_cros.js
+++ /dev/null
@@ -1,246 +0,0 @@
-// Copyright 2020 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// clang-format off
-import 'chrome://settings/lazy_load.js';
-
-import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
-import {AccountManagerBrowserProxyImpl, pageVisibility, ProfileInfoBrowserProxyImpl, Router, SyncBrowserProxyImpl} from 'chrome://settings/settings.js';
-import {TestBrowserProxy} from 'chrome://webui-test/test_browser_proxy.js';
-
-import {simulateSyncStatus} from './sync_test_util.js';
-import {TestProfileInfoBrowserProxy} from './test_profile_info_browser_proxy.js';
-import {TestSyncBrowserProxy} from './test_sync_browser_proxy.js';
-// clang-format on
-
-/** @implements {AccountManagerBrowserProxy} */
-class TestAccountManagerBrowserProxy extends TestBrowserProxy {
-  constructor() {
-    super([
-      'getAccounts',
-      'addAccount',
-      'reauthenticateAccount',
-      'removeAccount',
-      'showWelcomeDialogIfRequired',
-    ]);
-  }
-
-  /** @override */
-  getAccounts() {
-    this.methodCalled('getAccounts');
-    return Promise.resolve([{
-      id: '123',
-      accountType: 1,
-      isDeviceAccount: false,
-      isSignedIn: true,
-      unmigrated: false,
-      fullName: 'Primary Account',
-      email: 'user@gmail.com',
-      pic: 'data:image/png;base64,primaryAccountPicData',
-    }]);
-  }
-
-  /** @override */
-  addAccount() {
-    this.methodCalled('addAccount');
-  }
-
-  /** @override */
-  reauthenticateAccount(account_email) {
-    this.methodCalled('reauthenticateAccount', account_email);
-  }
-
-  /** @override */
-  removeAccount(account) {
-    this.methodCalled('removeAccount', account);
-  }
-
-  /** @override */
-  showWelcomeDialogIfRequired() {
-    this.methodCalled('showWelcomeDialogIfRequired');
-  }
-}
-
-/** @type {?AccountManagerBrowserProxy} */
-let accountManagerBrowserProxy = null;
-
-// Preferences should exist for embedded 'personalization_options.html'.
-// We don't perform tests on them.
-const DEFAULT_PREFS = {
-  profile: {password_manager_leak_detection: {value: true}},
-  signin: {
-    allowed_on_next_startup:
-        {type: chrome.settingsPrivate.PrefType.BOOLEAN, value: true}
-  },
-  safebrowsing:
-      {enabled: {value: true}, scout_reporting_enabled: {value: true}},
-};
-
-/** @type {?SettingsPeoplePageElement} */
-let peoplePage = null;
-
-/** @type {?ProfileInfoBrowserProxy} */
-let profileInfoBrowserProxy = null;
-
-/** @type {?SyncBrowserProxy} */
-let syncBrowserProxy = null;
-
-suite('Chrome OS', function() {
-  suiteSetup(function() {
-    loadTimeData.overrideValues({
-      // Simulate ChromeOSAccountManager (Google Accounts support).
-      isAccountManagerEnabled: true,
-    });
-  });
-
-  setup(async function() {
-    syncBrowserProxy = new TestSyncBrowserProxy();
-    SyncBrowserProxyImpl.setInstance(syncBrowserProxy);
-
-    profileInfoBrowserProxy = new TestProfileInfoBrowserProxy();
-    ProfileInfoBrowserProxyImpl.setInstance(profileInfoBrowserProxy);
-
-    accountManagerBrowserProxy = new TestAccountManagerBrowserProxy();
-    AccountManagerBrowserProxyImpl.setInstance(accountManagerBrowserProxy);
-
-    PolymerTest.clearBody();
-    peoplePage = document.createElement('settings-people-page');
-    peoplePage.prefs = DEFAULT_PREFS;
-    peoplePage.pageVisibility = pageVisibility;
-    document.body.appendChild(peoplePage);
-
-    await accountManagerBrowserProxy.whenCalled('getAccounts');
-    await syncBrowserProxy.whenCalled('getSyncStatus');
-    flush();
-  });
-
-  teardown(function() {
-    peoplePage.remove();
-  });
-
-  test('GAIA name and picture', async () => {
-    chai.assert.include(
-        peoplePage.shadowRoot.querySelector('#profile-icon')
-            .style.backgroundImage,
-        'data:image/png;base64,primaryAccountPicData');
-    assertEquals(
-        'Primary Account',
-        peoplePage.shadowRoot.querySelector('#profile-name')
-            .textContent.trim());
-  });
-
-  test('profile row is actionable', () => {
-    // Simulate a signed-in user.
-    simulateSyncStatus({
-      signedIn: true,
-    });
-
-    // Profile row opens account manager, so the row is actionable.
-    const profileRow = peoplePage.shadowRoot.querySelector('#profile-row');
-    assertTrue(!!profileRow);
-    assertTrue(profileRow.hasAttribute('actionable'));
-    const subpageArrow =
-        peoplePage.shadowRoot.querySelector('#profile-subpage-arrow');
-    assertTrue(!!subpageArrow);
-    assertFalse(subpageArrow.hidden);
-  });
-});
-
-suite('Chrome OS with account manager disabled', function() {
-  suiteSetup(function() {
-    loadTimeData.overrideValues({
-      // Disable ChromeOSAccountManager (Google Accounts support).
-      isAccountManagerEnabled: false,
-    });
-  });
-
-  setup(async function() {
-    syncBrowserProxy = new TestSyncBrowserProxy();
-    SyncBrowserProxyImpl.setInstance(syncBrowserProxy);
-
-    profileInfoBrowserProxy = new TestProfileInfoBrowserProxy();
-    ProfileInfoBrowserProxyImpl.setInstance(profileInfoBrowserProxy);
-
-    PolymerTest.clearBody();
-    peoplePage = document.createElement('settings-people-page');
-    peoplePage.prefs = DEFAULT_PREFS;
-    peoplePage.pageVisibility = pageVisibility;
-    document.body.appendChild(peoplePage);
-
-    await syncBrowserProxy.whenCalled('getSyncStatus');
-    flush();
-  });
-
-  teardown(function() {
-    peoplePage.remove();
-  });
-
-  test('profile row is not actionable', () => {
-    // Simulate a signed-in user.
-    simulateSyncStatus({
-      signedIn: true,
-    });
-
-    // Account manager isn't available, so the row isn't actionable.
-    const profileIcon = peoplePage.shadowRoot.querySelector('#profile-icon');
-    assertTrue(!!profileIcon);
-    assertFalse(profileIcon.hasAttribute('actionable'));
-    const profileRow = peoplePage.shadowRoot.querySelector('#profile-row');
-    assertTrue(!!profileRow);
-    assertFalse(profileRow.hasAttribute('actionable'));
-    const subpageArrow =
-        peoplePage.shadowRoot.querySelector('#profile-subpage-arrow');
-    assertTrue(!!subpageArrow);
-    assertTrue(subpageArrow.hidden);
-
-    // Clicking on profile icon doesn't navigate to a new route.
-    const oldRoute = Router.getInstance().getCurrentRoute();
-    profileIcon.click();
-    assertEquals(oldRoute, Router.getInstance().getCurrentRoute());
-  });
-});
-
-suite('Chrome OS with UseBrowserSyncConsent', function() {
-  suiteSetup(function() {
-    loadTimeData.overrideValues({
-      useBrowserSyncConsent: true,
-    });
-  });
-
-  setup(async function() {
-    syncBrowserProxy = new TestSyncBrowserProxy();
-    SyncBrowserProxyImpl.setInstance(syncBrowserProxy);
-
-    profileInfoBrowserProxy = new TestProfileInfoBrowserProxy();
-    ProfileInfoBrowserProxyImpl.setInstance(profileInfoBrowserProxy);
-
-    PolymerTest.clearBody();
-    peoplePage = document.createElement('settings-people-page');
-    peoplePage.prefs = DEFAULT_PREFS;
-    peoplePage.pageVisibility = pageVisibility;
-    document.body.appendChild(peoplePage);
-
-    await syncBrowserProxy.whenCalled('getSyncStatus');
-    flush();
-  });
-
-  teardown(function() {
-    peoplePage.remove();
-  });
-
-  test('Sync account control is shown', () => {
-    simulateSyncStatus({
-      syncSystemEnabled: true,
-    });
-
-    // Account control is visible.
-    const accountControl =
-        peoplePage.shadowRoot.querySelector('settings-sync-account-control');
-    assertNotEquals('none', window.getComputedStyle(accountControl).display);
-
-    // Profile row items are not available.
-    assertFalse(!!peoplePage.shadowRoot.querySelector('#profile-icon'));
-    assertFalse(!!peoplePage.shadowRoot.querySelector('#profile-row'));
-  });
-});

chrome/test/data/webui/settings/people_page_test_cros.ts

diff --git a/chrome/test/data/webui/settings/people_page_test_cros.ts b/chrome/test/data/webui/settings/people_page_test_cros.ts
new file mode 100644
index 0000000..d7d0dfcf
--- /dev/null
+++ b/chrome/test/data/webui/settings/people_page_test_cros.ts
@@ -0,0 +1,222 @@
+// Copyright 2020 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// clang-format off
+import 'chrome://settings/lazy_load.js';
+import 'chrome://settings/settings.js';
+
+import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
+import {AccountManagerBrowserProxy, AccountManagerBrowserProxyImpl, loadTimeData, pageVisibility, ProfileInfoBrowserProxyImpl, Router, SettingsPeoplePageElement, StatusAction, SyncBrowserProxyImpl} from 'chrome://settings/settings.js';
+import {assertEquals, assertFalse, assertNotEquals, assertTrue} from 'chrome://webui-test/chai_assert.js';
+import {TestBrowserProxy} from 'chrome://webui-test/test_browser_proxy.js';
+
+import {simulateSyncStatus} from './sync_test_util.js';
+import {TestProfileInfoBrowserProxy} from './test_profile_info_browser_proxy.js';
+import {TestSyncBrowserProxy} from './test_sync_browser_proxy.js';
+
+// clang-format on
+
+class TestAccountManagerBrowserProxy extends TestBrowserProxy implements
+    AccountManagerBrowserProxy {
+  constructor() {
+    super([
+      'getAccounts',
+    ]);
+  }
+
+  getAccounts() {
+    this.methodCalled('getAccounts');
+    return Promise.resolve([{
+      id: '123',
+      accountType: 1,
+      isDeviceAccount: false,
+      isSignedIn: true,
+      unmigrated: false,
+      fullName: 'Primary Account',
+      email: 'user@gmail.com',
+      pic: 'data:image/png;base64,primaryAccountPicData',
+    }]);
+  }
+}
+
+let accountManagerBrowserProxy: TestAccountManagerBrowserProxy;
+
+// Preferences should exist for embedded 'personalization_options.html'.
+// We don't perform tests on them.
+const DEFAULT_PREFS = {
+  profile: {password_manager_leak_detection: {value: true}},
+  signin: {
+    allowed_on_next_startup:
+        {type: chrome.settingsPrivate.PrefType.BOOLEAN, value: true}
+  },
+  safebrowsing:
+      {enabled: {value: true}, scout_reporting_enabled: {value: true}},
+};
+
+let peoplePage: SettingsPeoplePageElement;
+let profileInfoBrowserProxy: TestProfileInfoBrowserProxy;
+let syncBrowserProxy: TestSyncBrowserProxy;
+
+suite('Chrome OS', function() {
+  suiteSetup(function() {
+    loadTimeData.overrideValues({
+      // Simulate ChromeOSAccountManager (Google Accounts support).
+      isAccountManagerEnabled: true,
+    });
+  });
+
+  setup(async function() {
+    syncBrowserProxy = new TestSyncBrowserProxy();
+    SyncBrowserProxyImpl.setInstance(syncBrowserProxy);
+
+    profileInfoBrowserProxy = new TestProfileInfoBrowserProxy();
+    ProfileInfoBrowserProxyImpl.setInstance(profileInfoBrowserProxy);
+
+    accountManagerBrowserProxy = new TestAccountManagerBrowserProxy();
+    AccountManagerBrowserProxyImpl.setInstance(accountManagerBrowserProxy);
+
+    document.body.innerHTML = '';
+    peoplePage = document.createElement('settings-people-page');
+    peoplePage.prefs = DEFAULT_PREFS;
+    peoplePage.pageVisibility = pageVisibility;
+    document.body.appendChild(peoplePage);
+
+    await accountManagerBrowserProxy.whenCalled('getAccounts');
+    await syncBrowserProxy.whenCalled('getSyncStatus');
+    flush();
+  });
+
+  teardown(function() {
+    peoplePage.remove();
+  });
+
+  test('GAIA name and picture', async () => {
+    chai.assert.include(
+        peoplePage.shadowRoot!.querySelector<HTMLElement>(
+                                  '#profile-icon')!.style.backgroundImage,
+        'data:image/png;base64,primaryAccountPicData');
+    assertEquals(
+        'Primary Account',
+        peoplePage.shadowRoot!.querySelector(
+                                  '#profile-name')!.textContent!.trim());
+  });
+
+  test('profile row is actionable', () => {
+    // Simulate a signed-in user.
+    simulateSyncStatus({
+      signedIn: true,
+      statusAction: StatusAction.NO_ACTION,
+    });
+
+    // Profile row opens account manager, so the row is actionable.
+    const profileRow = peoplePage.shadowRoot!.querySelector('#profile-row');
+    assertTrue(!!profileRow);
+    assertTrue(profileRow!.hasAttribute('actionable'));
+    const subpageArrow = peoplePage.shadowRoot!.querySelector<HTMLElement>(
+        '#profile-subpage-arrow');
+    assertTrue(!!subpageArrow);
+    assertFalse(subpageArrow!.hidden);
+  });
+});
+
+suite('Chrome OS with account manager disabled', function() {
+  suiteSetup(function() {
+    loadTimeData.overrideValues({
+      // Disable ChromeOSAccountManager (Google Accounts support).
+      isAccountManagerEnabled: false,
+    });
+  });
+
+  setup(async function() {
+    syncBrowserProxy = new TestSyncBrowserProxy();
+    SyncBrowserProxyImpl.setInstance(syncBrowserProxy);
+
+    profileInfoBrowserProxy = new TestProfileInfoBrowserProxy();
+    ProfileInfoBrowserProxyImpl.setInstance(profileInfoBrowserProxy);
+
+    document.body.innerHTML = '';
+    peoplePage = document.createElement('settings-people-page');
+    peoplePage.prefs = DEFAULT_PREFS;
+    peoplePage.pageVisibility = pageVisibility;
+    document.body.appendChild(peoplePage);
+
+    await syncBrowserProxy.whenCalled('getSyncStatus');
+    flush();
+  });
+
+  teardown(function() {
+    peoplePage.remove();
+  });
+
+  test('profile row is not actionable', () => {
+    // Simulate a signed-in user.
+    simulateSyncStatus({
+      signedIn: true,
+      statusAction: StatusAction.NO_ACTION,
+    });
+
+    // Account manager isn't available, so the row isn't actionable.
+    const profileIcon =
+        peoplePage.shadowRoot!.querySelector<HTMLElement>('#profile-icon');
+    assertTrue(!!profileIcon);
+    assertFalse(profileIcon!.hasAttribute('actionable'));
+    const profileRow = peoplePage.shadowRoot!.querySelector('#profile-row');
+    assertTrue(!!profileRow);
+    assertFalse(profileRow!.hasAttribute('actionable'));
+    const subpageArrow = peoplePage.shadowRoot!.querySelector<HTMLElement>(
+        '#profile-subpage-arrow');
+    assertTrue(!!subpageArrow!);
+    assertTrue(subpageArrow!.hidden);
+
+    // Clicking on profile icon doesn't navigate to a new route.
+    const oldRoute = Router.getInstance().getCurrentRoute();
+    profileIcon!.click();
+    assertEquals(oldRoute, Router.getInstance().getCurrentRoute());
+  });
+});
+
+suite('Chrome OS with UseBrowserSyncConsent', function() {
+  suiteSetup(function() {
+    loadTimeData.overrideValues({
+      useBrowserSyncConsent: true,
+    });
+  });
+
+  setup(async function() {
+    syncBrowserProxy = new TestSyncBrowserProxy();
+    SyncBrowserProxyImpl.setInstance(syncBrowserProxy);
+
+    profileInfoBrowserProxy = new TestProfileInfoBrowserProxy();
+    ProfileInfoBrowserProxyImpl.setInstance(profileInfoBrowserProxy);
+
+    document.body.innerHTML = '';
+    peoplePage = document.createElement('settings-people-page');
+    peoplePage.prefs = DEFAULT_PREFS;
+    peoplePage.pageVisibility = pageVisibility;
+    document.body.appendChild(peoplePage);
+
+    await syncBrowserProxy.whenCalled('getSyncStatus');
+    flush();
+  });
+
+  teardown(function() {
+    peoplePage.remove();
+  });
+
+  test('Sync account control is shown', () => {
+    simulateSyncStatus({
+      syncSystemEnabled: true,
+      statusAction: StatusAction.NO_ACTION,
+    });
+
+    // Account control is visible.
+    const accountControl =
+        peoplePage.shadowRoot!.querySelector('settings-sync-account-control')!;
+    assertNotEquals('none', window.getComputedStyle(accountControl).display);
+
+    // Profile row items are not available.
+    assertFalse(!!peoplePage.shadowRoot!.querySelector('#profile-icon'));
+    assertFalse(!!peoplePage.shadowRoot!.querySelector('#profile-row'));
+  });
+});

chrome/test/data/webui/settings/sync_test_util.ts

diff --git a/chrome/test/data/webui/settings/sync_test_util.ts b/chrome/test/data/webui/settings/sync_test_util.ts
index 259f59e2..e517c7b 100644
--- a/chrome/test/data/webui/settings/sync_test_util.ts
+++ b/chrome/test/data/webui/settings/sync_test_util.ts
@@ -63,12 +63,12 @@
   Router.resetInstanceForTesting(new Router(routes));
 }
 
-export function simulateSyncStatus(status: SyncStatus) {
+export function simulateSyncStatus(status: SyncStatus|undefined) {
   webUIListenerCallback('sync-status-changed', status);
   flush();
 }
 
-export function simulateStoredAccounts(accounts: StoredAccount[]) {
+export function simulateStoredAccounts(accounts: StoredAccount[]|undefined) {
   webUIListenerCallback('stored-accounts-updated', accounts);
   flush();
 }

chromeos/CHROMEOS_LKGM

diff --git a/chromeos/CHROMEOS_LKGM b/chromeos/CHROMEOS_LKGM
index dc164d9..040f9e7 100644
--- a/chromeos/CHROMEOS_LKGM
+++ b/chromeos/CHROMEOS_LKGM
@@ -1 +1 @@
-14388.0.0
\ No newline at end of file
+14390.0.0
\ No newline at end of file

chromeos/chromeos_strings.grd

diff --git a/chromeos/chromeos_strings.grd b/chromeos/chromeos_strings.grd
index df62186..75da5bd 100644
--- a/chromeos/chromeos_strings.grd
+++ b/chromeos/chromeos_strings.grd
@@ -2422,7 +2422,7 @@
       <message name="IDS_SHIMLESS_RMA_FIRMWARE_WAIT_FOR_USB" translateable="false" desc="The prompt to insert a thumb drive with the recovery image for this device.">
       Insert your thumb drive with the downloaded recovery image.
       </message>
-      <message name="IDS_SHIMLESS_RMA_FIRMWARE_NOT_FOUND" translateable="false" desc="The message when a thumb drive is detected but it does not conatin a valid recovery image for this device.">
+      <message name="IDS_SHIMLESS_RMA_FIRMWARE_FILE_NOT_FOUND" translateable="false" desc="The message when a thumb drive is detected but it does not conatin a valid recovery image for this device.">
       Recovery image not found. Insert your thumb drive with the downloaded recovery image.
       </message>
       <message name="IDS_SHIMLESS_RMA_FIRMWARE_UPDATING" translateable="false" desc="The message when the firmware is being installed.">

chromeos/profiles/orderfile.newest.txt

diff --git a/chromeos/profiles/orderfile.newest.txt b/chromeos/profiles/orderfile.newest.txt
index 169de8b..27324e0 100644
--- a/chromeos/profiles/orderfile.newest.txt
+++ b/chromeos/profiles/orderfile.newest.txt
@@ -1 +1 @@
-chromeos-chrome-orderfile-field-98-4729.0-1638787322-benchmark-98.0.4744.1-r1.orderfile.xz
+chromeos-chrome-orderfile-field-98-4729.0-1638787322-benchmark-98.0.4754.0-r1.orderfile.xz

components/autofill/core/browser/autofill_external_delegate.cc

diff --git a/components/autofill/core/browser/autofill_external_delegate.cc b/components/autofill/core/browser/autofill_external_delegate.cc
index a6e66c8..686643d 100644
--- a/components/autofill/core/browser/autofill_external_delegate.cc
+++ b/components/autofill/core/browser/autofill_external_delegate.cc
@@ -231,16 +231,23 @@
   manager_->DidSuppressPopup(query_form_, query_field_);
 }
 
-void AutofillExternalDelegate::DidSelectSuggestion(const std::u16string& value,
-                                                   int frontend_id) {
+void AutofillExternalDelegate::DidSelectSuggestion(
+    const std::u16string& value,
+    int frontend_id,
+    const std::string& backend_id) {
   ClearPreviewedForm();
 
-  // Only preview the data if it is a profile.
-  if (frontend_id > 0)
+  // Only preview the data if it is a profile or a virtual card.
+  if (frontend_id > 0) {
     FillAutofillFormData(frontend_id, true);
-  else if (frontend_id == POPUP_ITEM_ID_AUTOCOMPLETE_ENTRY)
+  } else if (frontend_id == POPUP_ITEM_ID_AUTOCOMPLETE_ENTRY) {
     driver_->RendererShouldPreviewFieldWithValue(query_field_.global_id(),
                                                  value);
+  } else if (frontend_id == POPUP_ITEM_ID_VIRTUAL_CREDIT_CARD_ENTRY) {
+    manager_->FillOrPreviewVirtualCardInformation(
+        mojom::RendererFormDataAction::kPreview, backend_id, query_id_,
+        query_form_, query_field_);
+  }
 }
 
 void AutofillExternalDelegate::DidAcceptSuggestion(
@@ -288,8 +295,9 @@
     // There can be multiple virtual credit cards that all rely on
     // POPUP_ITEM_ID_VIRTUAL_CREDIT_CARD_ENTRY as a frontend_id. In this case,
     // the backend_id identifies the actually chosen credit card.
-    manager_->FillVirtualCardInformation(backend_id, query_id_, query_form_,
-                                         query_field_);
+    manager_->FillOrPreviewVirtualCardInformation(
+        mojom::RendererFormDataAction::kFill, backend_id, query_id_,
+        query_form_, query_field_);
   } else {
     if (frontend_id > 0) {  // Denotes an Autofill suggestion.
       AutofillMetrics::LogAutofillSuggestionAcceptedIndex(

components/autofill/core/browser/autofill_external_delegate.h

diff --git a/components/autofill/core/browser/autofill_external_delegate.h b/components/autofill/core/browser/autofill_external_delegate.h
index 667f4291..268b63e8 100644
--- a/components/autofill/core/browser/autofill_external_delegate.h
+++ b/components/autofill/core/browser/autofill_external_delegate.h
@@ -47,7 +47,8 @@
   void OnPopupHidden() override;
   void OnPopupSuppressed() override;
   void DidSelectSuggestion(const std::u16string& value,
-                           int frontend_id) override;
+                           int frontend_id,
+                           const std::string& backend_id) override;
   void DidAcceptSuggestion(const std::u16string& value,
                            int frontend_id,
                            const std::string& backend_id,

components/autofill/core/browser/autofill_external_delegate_unittest.cc

diff --git a/components/autofill/core/browser/autofill_external_delegate_unittest.cc b/components/autofill/core/browser/autofill_external_delegate_unittest.cc
index ba6c644..68c7134d 100644
--- a/components/autofill/core/browser/autofill_external_delegate_unittest.cc
+++ b/components/autofill/core/browser/autofill_external_delegate_unittest.cc
@@ -126,8 +126,9 @@
               (const FormData& form, const FormFieldData& field),
               (override));
   MOCK_METHOD(void,
-              FillVirtualCardInformation,
-              (const std::string& guid,
+              FillOrPreviewVirtualCardInformation,
+              (mojom::RendererFormDataAction action,
+               const std::string& guid,
                int query_id,
                const FormData& form,
                const FormFieldData& field),
@@ -598,7 +599,7 @@
   EXPECT_CALL(*browser_autofill_manager_, FillOrPreviewForm(_, _, _, _, _))
       .Times(0);
   EXPECT_CALL(*autofill_driver_, RendererShouldClearPreviewedForm()).Times(1);
-  external_delegate_->DidSelectSuggestion(std::u16string(), -1);
+  external_delegate_->DidSelectSuggestion(std::u16string(), -1, std::string());
 
   // Ensure it doesn't try to fill the form in with the negative id.
   EXPECT_CALL(autofill_client_,
@@ -616,21 +617,30 @@
   // cause any previews to get cleared.
   IssueOnQuery(123);
   EXPECT_CALL(*autofill_driver_, RendererShouldClearPreviewedForm()).Times(1);
-  external_delegate_->DidSelectSuggestion(u"baz foo",
-                                          POPUP_ITEM_ID_PASSWORD_ENTRY);
+  external_delegate_->DidSelectSuggestion(
+      u"baz foo", POPUP_ITEM_ID_PASSWORD_ENTRY, std::string());
   EXPECT_CALL(*autofill_driver_, RendererShouldClearPreviewedForm()).Times(1);
   EXPECT_CALL(
       *browser_autofill_manager_,
       FillOrPreviewForm(mojom::RendererFormDataAction::kPreview, _, _, _, _));
-  external_delegate_->DidSelectSuggestion(u"baz foo", 1);
+  external_delegate_->DidSelectSuggestion(u"baz foo", 1, std::string());
 
   // Ensure selecting an autocomplete entry will cause any previews to
   // get cleared.
   EXPECT_CALL(*autofill_driver_, RendererShouldClearPreviewedForm()).Times(1);
   EXPECT_CALL(*autofill_driver_, RendererShouldPreviewFieldWithValue(
                                      field_id_, std::u16string(u"baz foo")));
-  external_delegate_->DidSelectSuggestion(u"baz foo",
-                                          POPUP_ITEM_ID_AUTOCOMPLETE_ENTRY);
+  external_delegate_->DidSelectSuggestion(
+      u"baz foo", POPUP_ITEM_ID_AUTOCOMPLETE_ENTRY, std::string());
+
+  // Ensure selecting a virtual card entry will cause any previews to
+  // get cleared.
+  EXPECT_CALL(*autofill_driver_, RendererShouldClearPreviewedForm()).Times(1);
+  EXPECT_CALL(*browser_autofill_manager_,
+              FillOrPreviewVirtualCardInformation(
+                  mojom::RendererFormDataAction::kPreview, _, _, _, _));
+  external_delegate_->DidSelectSuggestion(
+      std::u16string(), POPUP_ITEM_ID_VIRTUAL_CREDIT_CARD_ENTRY, std::string());
 }
 
 // Test that the popup is hidden once we are done editing the autofill field.
@@ -905,14 +915,24 @@
 
 // Test that browser autofill manager will handle the unmasking request for the
 // virtual card after users accept the suggestion to use a virtual card.
-TEST_F(AutofillExternalDelegateUnitTest, VirtualCardOptionItem) {
+TEST_F(AutofillExternalDelegateUnitTest, AcceptVirtualCardOptionItem) {
+  FormData form;
   EXPECT_CALL(*browser_autofill_manager_,
-              FillVirtualCardInformation(_, _, _, _));
+              FillOrPreviewVirtualCardInformation(
+                  mojom::RendererFormDataAction::kFill, _, _, _, _));
   external_delegate_->DidAcceptSuggestion(
       std::u16string(), POPUP_ITEM_ID_VIRTUAL_CREDIT_CARD_ENTRY, std::string(),
       0);
 }
 
+TEST_F(AutofillExternalDelegateUnitTest, SelectVirtualCardOptionItem) {
+  EXPECT_CALL(*browser_autofill_manager_,
+              FillOrPreviewVirtualCardInformation(
+                  mojom::RendererFormDataAction::kPreview, _, _, _, _));
+  external_delegate_->DidSelectSuggestion(
+      std::u16string(), POPUP_ITEM_ID_VIRTUAL_CREDIT_CARD_ENTRY, std::string());
+}
+
 // Tests that the prompt to show account cards shows up when the corresponding
 // bit is set, including any suggestions that are passed along and the "Manage"
 // row in the footer.

components/autofill/core/browser/autofill_test_utils.cc

diff --git a/components/autofill/core/browser/autofill_test_utils.cc b/components/autofill/core/browser/autofill_test_utils.cc
index 03152f8..37a3d0f 100644
--- a/components/autofill/core/browser/autofill_test_utils.cc
+++ b/components/autofill/core/browser/autofill_test_utils.cc
@@ -16,6 +16,7 @@
 #include "components/autofill/core/browser/autofill_external_delegate.h"
 #include "components/autofill/core/browser/data_model/autofill_profile.h"
 #include "components/autofill/core/browser/data_model/credit_card.h"
+#include "components/autofill/core/browser/data_model/credit_card_test_api.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "components/autofill/core/browser/randomized_encoder.h"
 #include "components/autofill/core/browser/webdata/autofill_table.h"
@@ -560,6 +561,16 @@
   return credit_card;
 }
 
+CreditCard GetVirtualCard() {
+  CreditCard credit_card;
+  test::SetCreditCardInfo(&credit_card, "Lorem Ipsum",
+                          "5555555555554444",  // Mastercard
+                          "10", test::NextYear().c_str(), "1");
+  credit_card.set_record_type(CreditCard::RecordType::VIRTUAL_CARD);
+  CreditCardTestApi(&credit_card).set_network_for_virtual_card(kMasterCard);
+  return credit_card;
+}
+
 CreditCard GetRandomCreditCard(CreditCard::RecordType record_type) {
   static const char* const kNetworks[] = {
       kAmericanExpressCard,

components/autofill/core/browser/autofill_test_utils.h

diff --git a/components/autofill/core/browser/autofill_test_utils.h b/components/autofill/core/browser/autofill_test_utils.h
index 1082d8e..6d528eb 100644
--- a/components/autofill/core/browser/autofill_test_utils.h
+++ b/components/autofill/core/browser/autofill_test_utils.h
@@ -215,6 +215,9 @@
 // Returns a full server card full of dummy info.
 CreditCard GetFullServerCard();
 
+// Returns a virtual card full of dummy info.
+CreditCard GetVirtualCard();
+
 // Returns a randomly generated credit card of |record_type|. Note that the
 // card is not guaranteed to be valid/sane from a card validation standpoint.
 CreditCard GetRandomCreditCard(CreditCard::RecordType record_Type);

components/autofill/core/browser/browser_autofill_manager.cc

diff --git a/components/autofill/core/browser/browser_autofill_manager.cc b/components/autofill/core/browser/browser_autofill_manager.cc
index 6adc223..79c9b39 100644
--- a/components/autofill/core/browser/browser_autofill_manager.cc
+++ b/components/autofill/core/browser/browser_autofill_manager.cc
@@ -1068,7 +1068,8 @@
   }
 
   FillOrPreviewDataModelForm(action, query_id, form, field, &credit_card_,
-                             /*cvc=*/nullptr, form_structure, autofill_field);
+                             /*optional_cvc=*/nullptr, form_structure,
+                             autofill_field);
 }
 
 void BrowserAutofillManager::FillOrPreviewProfileForm(
@@ -1141,7 +1142,8 @@
                            /*query_id=*/kNoQueryId, form, field, profile);
 }
 
-void BrowserAutofillManager::FillVirtualCardInformation(
+void BrowserAutofillManager::FillOrPreviewVirtualCardInformation(
+    mojom::RendererFormDataAction action,
     const std::string& guid,
     int query_id,
     const FormData& form,
@@ -1155,8 +1157,7 @@
   if (credit_card) {
     CreditCard copy = *credit_card;
     copy.set_record_type(CreditCard::VIRTUAL_CARD);
-    FillOrPreviewCreditCardForm(mojom::RendererFormDataAction::kFill, query_id,
-                                form, field, &copy);
+    FillOrPreviewCreditCardForm(action, query_id, form, field, &copy);
   }
 }
 

components/autofill/core/browser/browser_autofill_manager.h

diff --git a/components/autofill/core/browser/browser_autofill_manager.h b/components/autofill/core/browser/browser_autofill_manager.h
index 455d1f8..2424b26 100644
--- a/components/autofill/core/browser/browser_autofill_manager.h
+++ b/components/autofill/core/browser/browser_autofill_manager.h
@@ -154,10 +154,12 @@
 
   // Fetches the related virtual card information given the related actual card
   // |guid| and fills the information into the form.
-  virtual void FillVirtualCardInformation(const std::string& guid,
-                                          int query_id,
-                                          const FormData& form,
-                                          const FormFieldData& field);
+  virtual void FillOrPreviewVirtualCardInformation(
+      mojom::RendererFormDataAction action,
+      const std::string& guid,
+      int query_id,
+      const FormData& form,
+      const FormFieldData& field);
 
   // Returns true if the value/identifier is deletable. Fills out
   // |title| and |body| with relevant user-facing text.

components/autofill/core/browser/browser_autofill_manager_unittest.cc

diff --git a/components/autofill/core/browser/browser_autofill_manager_unittest.cc b/components/autofill/core/browser/browser_autofill_manager_unittest.cc
index 69ce35fb6..ef683322 100644
--- a/components/autofill/core/browser/browser_autofill_manager_unittest.cc
+++ b/components/autofill/core/browser/browser_autofill_manager_unittest.cc
@@ -532,6 +532,21 @@
     FillAutofillFormData(input_query_id, input_form, input_field, unique_id);
   }
 
+  void PreviewVirtualCardDataAndSaveResults(
+      mojom::RendererFormDataAction action,
+      const std::string& guid,
+      int input_query_id,
+      const FormData& input_form,
+      const FormFieldData& input_field,
+      int* response_query_id,
+      FormData* response_data) {
+    EXPECT_CALL(*autofill_driver_, FillOrPreviewForm(_, _, _, _, _))
+        .WillOnce((DoAll(testing::SaveArg<0>(response_query_id),
+                         testing::SaveArg<2>(response_data))));
+    browser_autofill_manager_->FillOrPreviewVirtualCardInformation(
+        action, guid, input_query_id, input_form, input_field);
+  }
+
   int MakeFrontendID(const std::string& cc_sid,
                      const std::string& profile_sid) const {
     return browser_autofill_manager_->MakeFrontendID(cc_sid, profile_sid);
@@ -4236,7 +4251,7 @@
        FillCreditCardForm_VirtualCard) {
   personal_data_.ClearCreditCards();
   CreditCard masked_server_card;
-  test::SetCreditCardInfo(&masked_server_card, "Lorem Ispum",
+  test::SetCreditCardInfo(&masked_server_card, "Lorem Ipsum",
                           "5555555555554444",  // Mastercard
                           "10", test::NextYear().c_str(), "1");
   masked_server_card.set_guid("00000000-0000-0000-0000-000000000007");
@@ -4250,8 +4265,9 @@
   std::vector<FormData> forms(1, form);
   FormsSeen(forms);
 
-  browser_autofill_manager_->FillVirtualCardInformation(
-      masked_server_card.guid(), kDefaultPageID, form, form.fields[1]);
+  browser_autofill_manager_->FillOrPreviewVirtualCardInformation(
+      mojom::RendererFormDataAction::kFill, masked_server_card.guid(),
+      kDefaultPageID, form, form.fields[1]);
 
   CardUnmaskDelegate::UserProvidedUnmaskDetails details;
   details.cvc = u"123";
@@ -4266,6 +4282,42 @@
             GURL("https://example.test/"));
 }
 
+TEST_P(BrowserAutofillManagerStructuredProfileTest,
+       PreviewCreditCardForm_VirtualCard) {
+  personal_data_.ClearCreditCards();
+  CreditCard virtual_card = test::GetVirtualCard();
+  personal_data_.AddServerCreditCard(virtual_card);
+  // Set up our form data.
+  FormData form;
+  CreateTestCreditCardFormData(&form, true, false);
+  std::vector<FormData> forms(1, form);
+  FormsSeen(forms);
+
+  int response_page_id = 0;
+  FormData response_data;
+  PreviewVirtualCardDataAndSaveResults(
+      mojom::RendererFormDataAction::kPreview, virtual_card.guid(),
+      kDefaultPageID, form, form.fields[1], &response_page_id, &response_data);
+
+  std::u16string expected_cardholder_name = u"Lorem Ipsum";
+  // Virtual card number using obfuscated dots only: Virtual card Mastercard
+  // ••••4444
+  std::u16string expected_card_number =
+      u"Virtual card Mastercard  " + virtual_card.ObfuscatedLastFourDigits();
+  // Virtual card expiration month using obfuscated dots: ••
+  std::u16string expected_exp_month = CreditCard::GetMidlineEllipsisDots(2);
+  // Virtual card expiration year using obfuscated dots: ••••
+  std::u16string expected_exp_year = CreditCard::GetMidlineEllipsisDots(4);
+  // Virtual card cvc using obfuscated dots: •••
+  std::u16string expected_cvc = CreditCard::GetMidlineEllipsisDots(3);
+
+  EXPECT_EQ(response_data.fields[0].value, expected_cardholder_name);
+  EXPECT_EQ(response_data.fields[1].value, expected_card_number);
+  EXPECT_EQ(response_data.fields[2].value, expected_exp_month);
+  EXPECT_EQ(response_data.fields[3].value, expected_exp_year);
+  EXPECT_EQ(response_data.fields[4].value, expected_cvc);
+}
+
 // Test that non-focusable field is ignored while inferring boundaries between
 // sections, but not filled.
 TEST_P(BrowserAutofillManagerStructuredProfileTest,

components/autofill/core/browser/data_model/credit_card.cc

diff --git a/components/autofill/core/browser/data_model/credit_card.cc b/components/autofill/core/browser/data_model/credit_card.cc
index 5cd27b35..efa887b 100644
--- a/components/autofill/core/browser/data_model/credit_card.cc
+++ b/components/autofill/core/browser/data_model/credit_card.cc
@@ -49,14 +49,7 @@
 //  - \u2022 - Bullet.
 //  - \u2006 - SIX-PER-EM SPACE (small space between bullets).
 //  - \u2060 - WORD-JOINER (makes obfuscated string undivisible).
-constexpr char16_t kMidlineEllipsis4Dots[] =
-    u"\u2022\u2060\u2006\u2060"
-    u"\u2022\u2060\u2006\u2060"
-    u"\u2022\u2060\u2006\u2060"
-    u"\u2022\u2060\u2006\u2060";
-constexpr char16_t kMidlineEllipsis2Dots[] =
-    u"\u2022\u2060\u2006\u2060"
-    u"\u2022\u2060\u2006\u2060";
+constexpr char16_t kMidlineEllipsisDot[] = u"\u2022\u2060\u2006\u2060";
 constexpr char16_t kMidlineEllipsisPlainDot = u'\u2022';
 
 namespace {
@@ -141,11 +134,9 @@
 
 std::u16string GetObfuscatedStringForCardDigits(const std::u16string& digits,
                                                 int obfuscation_length) {
-  DCHECK(obfuscation_length == 2 || obfuscation_length == 4);
   std::u16string obfuscated_string =
-      std::u16string(obfuscation_length == 2 ? kMidlineEllipsis2Dots
-                                             : kMidlineEllipsis4Dots) +
-      digits;
+      CreditCard::GetMidlineEllipsisDots(obfuscation_length);
+  obfuscated_string.append(digits);
   base::i18n::WrapStringWithLTRFormatting(&obfuscated_string);
   return obfuscated_string;
 }
@@ -366,6 +357,18 @@
   return true;
 }
 
+// static
+std::u16string CreditCard::GetMidlineEllipsisDots(size_t num_dots) {
+  DCHECK(num_dots > 0);
+  std::u16string dots;
+  dots.reserve(sizeof(kMidlineEllipsisDot) * num_dots);
+
+  for (size_t i = 0; i < num_dots; i++) {
+    dots.append(kMidlineEllipsisDot);
+  }
+  return dots;
+}
+
 void CreditCard::SetNetworkForMaskedCard(base::StringPiece network) {
   DCHECK_EQ(MASKED_SERVER_CARD, record_type());
   network_ = std::string(network);

components/autofill/core/browser/data_model/credit_card.h

diff --git a/components/autofill/core/browser/data_model/credit_card.h b/components/autofill/core/browser/data_model/credit_card.h
index 922ef94..29a008a 100644
--- a/components/autofill/core/browser/data_model/credit_card.h
+++ b/components/autofill/core/browser/data_model/credit_card.h
@@ -13,6 +13,7 @@
 #include "base/gtest_prod_util.h"
 #include "base/strings/string_piece_forward.h"
 #include "build/build_config.h"
+#include "components/autofill/core/browser/autofill_field.h"
 #include "components/autofill/core/browser/data_model/autofill_data_model.h"
 #include "url/gurl.h"
 
@@ -21,8 +22,7 @@
 struct AutofillMetadata;
 
 // A midline horizontal ellipsis (U+22EF).
-extern const char16_t kMidlineEllipsis4Dots[];
-extern const char16_t kMidlineEllipsis2Dots[];
+extern const char16_t kMidlineEllipsisDot[];
 
 namespace internal {
 
@@ -112,6 +112,9 @@
   // because they are not required.
   static bool IsNicknameValid(const std::u16string& nickname);
 
+  // Returns string of dots for hidden card information.
+  static std::u16string GetMidlineEllipsisDots(size_t num_dots);
+
   // Network issuer strings are defined at the bottom of this file, e.g.
   // kVisaCard.
   void SetNetworkForMaskedCard(base::StringPiece network);
@@ -356,6 +359,8 @@
   }
 
  private:
+  friend class CreditCardTestApi;
+
   FRIEND_TEST_ALL_PREFIXES(CreditCardTest, SetExpirationDateFromString);
   FRIEND_TEST_ALL_PREFIXES(CreditCardTest, SetExpirationYearFromString);
 

components/autofill/core/browser/data_model/credit_card_test_api.h

diff --git a/components/autofill/core/browser/data_model/credit_card_test_api.h b/components/autofill/core/browser/data_model/credit_card_test_api.h
new file mode 100644
index 0000000..52a35c75
--- /dev/null
+++ b/components/autofill/core/browser/data_model/credit_card_test_api.h
@@ -0,0 +1,29 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_DATA_MODEL_CREDIT_CARD_TEST_API_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_DATA_MODEL_CREDIT_CARD_TEST_API_H_
+
+#include "components/autofill/core/browser/data_model/credit_card.h"
+
+namespace autofill {
+
+// Exposes some testing operations for CreditCard.
+class CreditCardTestApi {
+ public:
+  explicit CreditCardTestApi(CreditCard* creditcard) : creditcard_(creditcard) {
+    DCHECK(creditcard_);
+  }
+  void set_network_for_virtual_card(base::StringPiece network) {
+    DCHECK_EQ(CreditCard::VIRTUAL_CARD, creditcard_->record_type());
+    creditcard_->network_ = std::string(network);
+  }
+
+ private:
+  CreditCard* creditcard_;
+};
+
+}  // namespace autofill
+
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_DATA_MODEL_CREDIT_CARD_TEST_API_H_
\ No newline at end of file

components/autofill/core/browser/data_model/credit_card_unittest.cc

diff --git a/components/autofill/core/browser/data_model/credit_card_unittest.cc b/components/autofill/core/browser/data_model/credit_card_unittest.cc
index aa75e67..6efcfae 100644
--- a/components/autofill/core/browser/data_model/credit_card_unittest.cc
+++ b/components/autofill/core/browser/data_model/credit_card_unittest.cc
@@ -93,7 +93,8 @@
   const std::u16string digits = u"1235";
   const std::u16string expected =
       std::u16string() + base::i18n::kLeftToRightEmbeddingMark +
-      kMidlineEllipsis4Dots + digits + base::i18n::kPopDirectionalFormatting;
+      CreditCard::GetMidlineEllipsisDots(4) + digits +
+      base::i18n::kPopDirectionalFormatting;
   EXPECT_EQ(expected, internal::GetObfuscatedStringForCardDigits(
                           digits, /*obfuscation_length=*/4));
 }
@@ -1861,7 +1862,8 @@
   const std::u16string digits = u"1235";
   const std::u16string expected =
       std::u16string() + base::i18n::kLeftToRightEmbeddingMark +
-      kMidlineEllipsis2Dots + digits + base::i18n::kPopDirectionalFormatting;
+      CreditCard::GetMidlineEllipsisDots(2) + digits +
+      base::i18n::kPopDirectionalFormatting;
 
   EXPECT_EQ(expected, internal::GetObfuscatedStringForCardDigits(
                           digits, /*obfuscation_length=*/2));

components/autofill/core/browser/field_filler.cc

diff --git a/components/autofill/core/browser/field_filler.cc b/components/autofill/core/browser/field_filler.cc
index 61e06c9e..a5e3fdb 100644
--- a/components/autofill/core/browser/field_filler.cc
+++ b/components/autofill/core/browser/field_filler.cc
@@ -497,9 +497,9 @@
   return false;
 }
 
-// Return the appropriate credit card number from |credit_card|. Truncates the
+// Returns the appropriate credit card number from |credit_card|. Truncates the
 // credit card number to be split across HTML form input fields depending on if
-// |field.credit_card_number_offset()| is less than the length of the credit
+// 'field.credit_card_number_offset()' is less than the length of the credit
 // card number.
 std::u16string GetCreditCardNumberForInput(
     const CreditCard& credit_card,
@@ -517,7 +517,9 @@
           field.max_length >= credit_card.ObfuscatedLastFourDigits().length()));
 
     // If previewing a credit card number that needs to be split, pad the number
-    // to 16 digits rather than displaying a fancy string with RTL support.
+    // to 16 digits rather than displaying a fancy string with RTL support. This
+    // also returns 16 digits if there is only one field and it cannot fit the
+    // longer version CC number.
     value = is_single_field
                 ? credit_card.ObfuscatedLastFourDigits()
                 : credit_card.ObfuscatedLastFourDigitsForSplitFields();
@@ -537,6 +539,40 @@
   return value;
 }
 
+// Returns the appropriate credit card number from |virtual_card|. Truncates the
+// credit card number to be split across HTML form input fields depending on if
+// 'field.credit_card_number_offset()' is less than the length of the credit
+// card number.
+std::u16string GetVirtualCardNumberForPreviewInput(
+    const CreditCard& virtual_card,
+    const AutofillField& field) {
+  std::u16string value =
+      l10n_util::GetStringUTF16(
+          IDS_AUTOFILL_VIRTUAL_CARD_SUGGESTION_OPTION_VALUE) +
+      u" " + virtual_card.CardIdentifierStringForAutofillDisplay();
+
+  // |field|'s max_length truncates the credit card number to fit within.
+  if (field.credit_card_number_offset() < value.length()) {
+    // A single field is detected when the offset begins at 0 and the field's
+    // max_length can hold the entire obfuscated credit card number.
+    bool is_single_field =
+        (field.credit_card_number_offset() == 0 &&
+         (field.max_length == 0 || field.max_length >= value.length()));
+
+    if (!is_single_field)
+      value = virtual_card.ObfuscatedLastFourDigitsForSplitFields();
+
+    // Take the substring of the credit card number starting from the offset and
+    // ending at the field's max_length (or the entire string if max_length is
+    // 0).
+    value = value.substr(
+        field.credit_card_number_offset(),
+        field.max_length > 0 ? field.max_length : std::u16string::npos);
+  }
+
+  return value;
+}
+
 // Fills in the select control |field| with |value|. If an exact match is not
 // found, falls back to alternate filling strategies based on the |type|.
 bool FillSelectControl(const AutofillType& type,
@@ -677,6 +713,27 @@
   return value;
 }
 
+// Returns the appropriate virtual card expiration year for the field. Uses the
+// |field_type| and the |field|'s max_length attribute to determine if the year
+// needs to be truncated.
+std::u16string GetExpirationYearForVirtualCardPreviewInput(
+    ServerFieldType storable_type,
+    const AutofillField& field) {
+  if (storable_type == CREDIT_CARD_EXP_2_DIGIT_YEAR &&
+      (field.max_length == 2 || field.max_length == 0)) {
+    return CreditCard::GetMidlineEllipsisDots(2);
+  } else if (storable_type == CREDIT_CARD_EXP_4_DIGIT_YEAR &&
+             (field.max_length == 4 || field.max_length == 0)) {
+    return CreditCard::GetMidlineEllipsisDots(4);
+  }
+
+  if (field.max_length > 4) {
+    return CreditCard::GetMidlineEllipsisDots(4);
+  } else {
+    return CreditCard::GetMidlineEllipsisDots(field.max_length);
+  }
+}
+
 // Returns the appropriate expiration date from |credit_card| for the field
 // based on the |field_type|. Uses the |field|'s max_length attribute to
 // determine if the |value| needs to be truncated or padded. Returns an empty
@@ -720,6 +777,38 @@
   }
 }
 
+// Returns the appropriate virtual_card expiration date from for the field based
+// on the |field|'s max_length. Returns an empty string in case of a failure.
+std::u16string GetExpirationDateForVirtualCardPreviewInput(
+    const AutofillField& field,
+    std::string* failure_to_fill) {
+  switch (field.max_length) {
+    case 1:
+    case 2:
+    case 3:
+      if (failure_to_fill) {
+        *failure_to_fill +=
+            "Field to fill must have a max length of at least 4. ";
+      }
+      return std::u16string();
+    case 4:
+      // Expects MMYY
+      return CreditCard::GetMidlineEllipsisDots(4);
+    case 5:
+      // Expects MM/YY
+      return CreditCard::GetMidlineEllipsisDots(2) + u"/" +
+             CreditCard::GetMidlineEllipsisDots(2);
+    case 6:
+      // Expects MMYYYY
+      return CreditCard::GetMidlineEllipsisDots(2) +
+             CreditCard::GetMidlineEllipsisDots(4);
+    default:
+      // Return MM/YYYY for default case
+      return CreditCard::GetMidlineEllipsisDots(2) + u"/" +
+             CreditCard::GetMidlineEllipsisDots(4);
+  }
+}
+
 std::u16string RemoveWhitespace(const std::u16string& value) {
   std::u16string stripped_value;
   base::RemoveChars(value, base::kWhitespaceUTF16, &stripped_value);
@@ -828,6 +917,41 @@
   return value;
 }
 
+// Returns the appropriate |virtual_card| value based on |storable_type| to
+// preview into |field|.
+std::u16string GetValueForVirtualCardPreview(const CreditCard& virtual_card,
+                                             const std::string& app_locale,
+                                             const AutofillField& field,
+                                             std::string* failure_to_fill) {
+  DCHECK_EQ(virtual_card.record_type(), CreditCard::VIRTUAL_CARD);
+
+  ServerFieldType storable_type = field.Type().GetStorableType();
+
+  switch (storable_type) {
+    case CREDIT_CARD_VERIFICATION_CODE:
+      // For preview virtual card CVC, return three dots unless for American
+      // Express, which uses 4-digit CVCs.
+      return virtual_card.network() == kAmericanExpressCard
+                 ? CreditCard::GetMidlineEllipsisDots(4)
+                 : CreditCard::GetMidlineEllipsisDots(3);
+    case CREDIT_CARD_NUMBER:
+      return GetVirtualCardNumberForPreviewInput(virtual_card, field);
+    case CREDIT_CARD_EXP_MONTH:
+      // Expects MM
+      return CreditCard::GetMidlineEllipsisDots(2);
+    case CREDIT_CARD_EXP_2_DIGIT_YEAR:
+    case CREDIT_CARD_EXP_4_DIGIT_YEAR:
+      return GetExpirationYearForVirtualCardPreviewInput(storable_type, field);
+    case CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR:
+    case CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR:
+      return GetExpirationDateForVirtualCardPreviewInput(field,
+                                                         failure_to_fill);
+    default:
+      // All other cases handled here.
+      return virtual_card.GetInfo(storable_type, app_locale);
+  }
+}
+
 }  // namespace
 
 FieldFiller::FieldFiller(const std::string& app_locale,
@@ -851,8 +975,14 @@
     const CreditCard* credit_card =
         absl::get<const CreditCard*>(profile_or_credit_card);
 
-    value = GetValueForCreditCard(*credit_card, cvc, app_locale_, action, field,
-                                  failure_to_fill);
+    if (credit_card->record_type() == CreditCard::VIRTUAL_CARD &&
+        action == mojom::RendererFormDataAction::kPreview) {
+      value = GetValueForVirtualCardPreview(*credit_card, app_locale_, field,
+                                            failure_to_fill);
+    } else {
+      value = GetValueForCreditCard(*credit_card, cvc, app_locale_, action,
+                                    field, failure_to_fill);
+    }
   }
 
   // Grab AutofillProfile data.

components/autofill/core/browser/field_filler_unittest.cc

diff --git a/components/autofill/core/browser/field_filler_unittest.cc b/components/autofill/core/browser/field_filler_unittest.cc
index 399b17c..11f6088 100644
--- a/components/autofill/core/browser/field_filler_unittest.cc
+++ b/components/autofill/core/browser/field_filler_unittest.cc
@@ -26,6 +26,7 @@
 #include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/data_model/autofill_profile.h"
 #include "components/autofill/core/browser/data_model/credit_card.h"
+#include "components/autofill/core/browser/data_model/credit_card_test_api.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "components/autofill/core/browser/geo/alternative_state_name_map_test_utils.h"
 #include "components/autofill/core/browser/geo/country_names.h"
@@ -46,6 +47,10 @@
 using ::i18n::addressinput::Storage;
 using ::i18n::addressinput::TestdataSource;
 
+std::u16string kMidlineEllipsis2Dots = CreditCard::GetMidlineEllipsisDots(2);
+std::u16string kMidlineEllipsis3Dots = CreditCard::GetMidlineEllipsisDots(3);
+std::u16string kMidlineEllipsis4Dots = CreditCard::GetMidlineEllipsisDots(4);
+
 const std::vector<const char*> NotNumericMonthsContentsNoPlaceholder() {
   const std::vector<const char*> result = {"Jan", "Feb", "Mar", "Apr",
                                            "May", "Jun", "Jul", "Aug",
@@ -2021,4 +2026,213 @@
   EXPECT_EQ(u"BY", field.value);
 }
 
+TEST_F(AutofillFieldFillerTest, PreviewVirtualMonth) {
+  AutofillField field;
+  field.form_control_type = "text";
+  FieldFiller filler(/*app_locale=*/"en-US", /*address_normalizer=*/nullptr);
+  field.set_heuristic_type(CREDIT_CARD_EXP_MONTH);
+
+  // A month with two digits should return two dots.
+  CreditCard card = test::GetVirtualCard();
+  card.SetExpirationDateFromString(u"12/2017");
+  filler.FillFormField(field, &card, &field, /*cvc=*/std::u16string(),
+                       mojom::RendererFormDataAction::kPreview,
+                       /*failure_to_fill*/ nullptr);
+  EXPECT_EQ(kMidlineEllipsis2Dots, field.value);
+
+  // A month with one digit should still return two dots.
+  card.SetExpirationDateFromString(u"03/2019");
+  filler.FillFormField(field, &card, &field, /*cvc=*/std::u16string(),
+                       mojom::RendererFormDataAction::kPreview,
+                       /*failure_to_fill*/ nullptr);
+  EXPECT_EQ(kMidlineEllipsis2Dots, field.value);
+}
+
+TEST_F(AutofillFieldFillerTest, PreviewVirtualYear) {
+  AutofillField field;
+  field.form_control_type = "text";
+  FieldFiller filler(/*app_locale=*/"en-US", /*address_normalizer=*/nullptr);
+  field.set_heuristic_type(CREDIT_CARD_EXP_4_DIGIT_YEAR);
+
+  CreditCard card = test::GetVirtualCard();
+  card.SetExpirationDateFromString(u"12/2017");
+  filler.FillFormField(field, &card, &field, /*cvc=*/std::u16string(),
+                       mojom::RendererFormDataAction::kPreview,
+                       /*failure_to_fill*/ nullptr);
+  EXPECT_EQ(kMidlineEllipsis4Dots, field.value);
+
+  field.set_heuristic_type(CREDIT_CARD_EXP_2_DIGIT_YEAR);
+  filler.FillFormField(field, &card, &field, /*cvc=*/std::u16string(),
+                       mojom::RendererFormDataAction::kPreview,
+                       /*failure_to_fill*/ nullptr);
+  EXPECT_EQ(kMidlineEllipsis2Dots, field.value);
+}
+
+TEST_F(AutofillFieldFillerTest, PreviewVirtualShortenedYear) {
+  // Test reducing 4 digit year to 2 digits.
+  AutofillField field;
+  field.max_length = 2;
+  field.form_control_type = "text";
+  FieldFiller filler(/*app_locale=*/"en-US", /*address_normalizer=*/nullptr);
+  field.set_heuristic_type(CREDIT_CARD_EXP_4_DIGIT_YEAR);
+
+  CreditCard card = test::GetVirtualCard();
+  card.SetExpirationDateFromString(u"12/2017");
+  filler.FillFormField(field, &card, &field, /*cvc=*/std::u16string(),
+                       mojom::RendererFormDataAction::kPreview,
+                       /*failure_to_fill*/ nullptr);
+  EXPECT_EQ(kMidlineEllipsis2Dots, field.value);
+}
+
+TEST_F(AutofillFieldFillerTest, PreviewVirtualDate) {
+  AutofillField field;
+  field.form_control_type = "text";
+  FieldFiller filler(/*app_locale=*/"en-US", /*address_normalizer=*/nullptr);
+  field.set_heuristic_type(CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR);
+  field.max_length = 7;
+
+  // A date that has a year containing four digits should return two dots for
+  // month and four dots for year.
+  CreditCard card = test::GetVirtualCard();
+  card.SetExpirationDateFromString(u"12/2017");
+  filler.FillFormField(field, &card, &field, /*cvc=*/std::u16string(),
+                       mojom::RendererFormDataAction::kPreview,
+                       /*failure_to_fill*/ nullptr);
+  std::u16string slash = u"/";
+  std::u16string expected =
+      kMidlineEllipsis2Dots + slash + kMidlineEllipsis4Dots;
+  EXPECT_EQ(expected, field.value);
+
+  // A date that has a year containing two digits should return two dots for
+  // month and two for year.
+  field.set_heuristic_type(CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR);
+  field.max_length = 5;
+  filler.FillFormField(field, &card, &field, /*cvc=*/std::u16string(),
+                       mojom::RendererFormDataAction::kPreview,
+                       /*failure_to_fill*/ nullptr);
+
+  expected = kMidlineEllipsis2Dots + slash + kMidlineEllipsis2Dots;
+  EXPECT_EQ(expected, field.value);
+}
+
+TEST_F(AutofillFieldFillerTest, PreviewVirtualShortenedDate) {
+  // Test reducing dates to various max length field values.
+  AutofillField field;
+  field.form_control_type = "text";
+  field.max_length = 4;
+  FieldFiller filler(/*app_locale=*/"en-US", /*address_normalizer=*/nullptr);
+  field.set_heuristic_type(CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR);
+
+  CreditCard card = test::GetVirtualCard();
+  card.SetExpirationDateFromString(u"12/2017");
+  filler.FillFormField(field, &card, &field, /*cvc=*/std::u16string(),
+                       mojom::RendererFormDataAction::kPreview,
+                       /*failure_to_fill*/ nullptr);
+
+  // Expected: MMYY = ••••. Unlikely case
+  std::u16string expected = kMidlineEllipsis4Dots;
+  EXPECT_EQ(expected, field.value);
+
+  field.max_length = 5;
+  std::u16string slash = u"/";
+  filler.FillFormField(field, &card, &field, /*cvc=*/std::u16string(),
+                       mojom::RendererFormDataAction::kPreview,
+                       /*failure_to_fill*/ nullptr);
+
+  // Expected: MM/YY = ••/••.
+  expected = kMidlineEllipsis2Dots + slash + kMidlineEllipsis2Dots;
+  EXPECT_EQ(expected, field.value);
+
+  field.max_length = 6;
+  filler.FillFormField(field, &card, &field, /*cvc=*/std::u16string(),
+                       mojom::RendererFormDataAction::kPreview,
+                       /*failure_to_fill*/ nullptr);
+
+  // Expected: MMYYYY = ••••••.
+  expected = kMidlineEllipsis2Dots + std::u16string() + kMidlineEllipsis4Dots;
+  EXPECT_EQ(expected, field.value);
+
+  field.max_length = 7;
+  filler.FillFormField(field, &card, &field, /*cvc=*/std::u16string(),
+                       mojom::RendererFormDataAction::kPreview,
+                       /*failure_to_fill*/ nullptr);
+
+  // Expected: MM/YYYY = ••/••••.
+  expected = kMidlineEllipsis2Dots + slash + kMidlineEllipsis4Dots;
+  EXPECT_EQ(expected, field.value);
+}
+
+TEST_F(AutofillFieldFillerTest, PreviewVirtualCVC) {
+  AutofillField field;
+  field.form_control_type = "text";
+  FieldFiller filler(/*app_locale=*/"en-US", /*address_normalizer=*/nullptr);
+  field.set_heuristic_type(CREDIT_CARD_VERIFICATION_CODE);
+
+  CreditCard card = test::GetVirtualCard();
+  CreditCardTestApi(&card).set_network_for_virtual_card(kMasterCard);
+  filler.FillFormField(field, &card, &field, /*cvc=*/std::u16string(),
+                       mojom::RendererFormDataAction::kPreview,
+                       /*failure_to_fill*/ nullptr);
+  EXPECT_EQ(kMidlineEllipsis3Dots, field.value);
+}
+
+TEST_F(AutofillFieldFillerTest, PreviewVirtualCVCAmericanExpress) {
+  const char kAmericanExpressCard[] = "americanExpressCC";
+  AutofillField field;
+  field.form_control_type = "text";
+  FieldFiller filler(/*app_locale=*/"en-US", /*address_normalizer=*/nullptr);
+  field.set_heuristic_type(CREDIT_CARD_VERIFICATION_CODE);
+
+  CreditCard card = test::GetVirtualCard();
+  CreditCardTestApi(&card).set_network_for_virtual_card(kAmericanExpressCard);
+  filler.FillFormField(field, &card, &field, /*cvc=*/std::u16string(),
+                       mojom::RendererFormDataAction::kPreview,
+                       /*failure_to_fill*/ nullptr);
+  EXPECT_EQ(kMidlineEllipsis4Dots, field.value);
+}
+
+TEST_F(AutofillFieldFillerTest, PreviewVirtualCardNumber) {
+  AutofillField field;
+  field.set_heuristic_type(CREDIT_CARD_NUMBER);
+  field.set_credit_card_number_offset(50);
+  field.form_control_type = "text";
+  const char kMasterCard[] = "masterCardCC";
+
+  CreditCard card = test::GetVirtualCard();
+  card.SetNumber(u"5454545454545454");
+  CreditCardTestApi(&card).set_network_for_virtual_card(kMasterCard);
+  FieldFiller filler(/*app_locale=*/"en-US", /*address_normalizer=*/nullptr);
+  filler.FillFormField(field, &card, &field,
+                       /*cvc=*/std::u16string(),
+                       mojom::RendererFormDataAction::kPreview,
+                       /*failure_to_fill*/ nullptr);
+
+  // Virtual card Mastercard ••••5454‬
+  std::u16string expected =
+      u"Virtual card Mastercard  "
+      u"\x202A\x2022\x2060\x2006\x2060\x2022\x2060\x2006\x2060\x2022\x2060"
+      u"\x2006\x2060\x2022\x2060\x2006\x2060"
+      u"5454\x202C";
+
+  EXPECT_EQ(expected, field.value);
+}
+
+TEST_F(AutofillFieldFillerTest, PreviewVirtualCardholderName) {
+  std::u16string name = u"Jone Doe";
+
+  AutofillField field;
+  field.form_control_type = "text";
+  FieldFiller filler(/*app_locale=*/"en-US", /*address_normalizer=*/nullptr);
+  field.set_heuristic_type(CREDIT_CARD_NAME_FULL);
+
+  CreditCard card = test::GetVirtualCard();
+  card.SetRawInfoWithVerificationStatus(
+      CREDIT_CARD_NAME_FULL, name,
+      structured_address::VerificationStatus::kFormatted);
+  filler.FillFormField(field, &card, &field, /*cvc=*/std::u16string(),
+                       mojom::RendererFormDataAction::kPreview,
+                       /*failure_to_fill*/ nullptr);
+  EXPECT_EQ(name, field.value);
+}
+
 }  // namespace autofill

components/autofill/core/browser/metrics/autofill_metrics_unittest.cc

diff --git a/components/autofill/core/browser/metrics/autofill_metrics_unittest.cc b/components/autofill/core/browser/metrics/autofill_metrics_unittest.cc
index bced36d..19cc9d5 100644
--- a/components/autofill/core/browser/metrics/autofill_metrics_unittest.cc
+++ b/components/autofill/core/browser/metrics/autofill_metrics_unittest.cc
@@ -5562,8 +5562,9 @@
     // option based on the enrolled masked card.
     base::HistogramTester histogram_tester;
     std::string guid("10000000-0000-0000-0000-000000000002");  // masked card
-    browser_autofill_manager_->FillVirtualCardInformation(guid, kDefaultPageID,
-                                                          form, form.fields[2]);
+    browser_autofill_manager_->FillOrPreviewVirtualCardInformation(
+        mojom::RendererFormDataAction::kFill, guid, kDefaultPageID, form,
+        form.fields[2]);
     OnDidGetRealPan(AutofillClient::PaymentsRpcResult::kSuccess,
                     "6011000990139424");
     histogram_tester.ExpectBucketCount(
@@ -5588,12 +5589,14 @@
     // Simulating selecting a virtual card multiple times.
     base::HistogramTester histogram_tester;
     std::string guid("10000000-0000-0000-0000-000000000002");  // masked card
-    browser_autofill_manager_->FillVirtualCardInformation(guid, kDefaultPageID,
-                                                          form, form.fields[2]);
+    browser_autofill_manager_->FillOrPreviewVirtualCardInformation(
+        mojom::RendererFormDataAction::kFill, guid, kDefaultPageID, form,
+        form.fields[2]);
     OnDidGetRealPan(AutofillClient::PaymentsRpcResult::kSuccess,
                     "6011000990139424");
-    browser_autofill_manager_->FillVirtualCardInformation(guid, kDefaultPageID,
-                                                          form, form.fields[2]);
+    browser_autofill_manager_->FillOrPreviewVirtualCardInformation(
+        mojom::RendererFormDataAction::kFill, guid, kDefaultPageID, form,
+        form.fields[2]);
     OnDidGetRealPan(AutofillClient::PaymentsRpcResult::kSuccess,
                     "6011000990139424");
     histogram_tester.ExpectBucketCount(
@@ -5671,8 +5674,9 @@
     // based on the enrolled masked card.
     base::HistogramTester histogram_tester;
     std::string guid("10000000-0000-0000-0000-000000000002");  // masked card
-    browser_autofill_manager_->FillVirtualCardInformation(
-        guid, kDefaultPageID, form, form.fields.front());
+    browser_autofill_manager_->FillOrPreviewVirtualCardInformation(
+        mojom::RendererFormDataAction::kFill, guid, kDefaultPageID, form,
+        form.fields.front());
     OnDidGetRealPan(AutofillClient::PaymentsRpcResult::kSuccess,
                     "6011000990139424");
     histogram_tester.ExpectBucketCount(
@@ -6662,8 +6666,9 @@
     browser_autofill_manager_->OnAskForValuesToFill(
         0, form, field, gfx::RectF(), /*autoselect_first_suggestion=*/false);
     std::string guid("10000000-0000-0000-0000-000000000002");  // masked card
-    browser_autofill_manager_->FillVirtualCardInformation(
-        guid, kDefaultPageID, form, form.fields.front());
+    browser_autofill_manager_->FillOrPreviewVirtualCardInformation(
+        mojom::RendererFormDataAction::kFill, guid, kDefaultPageID, form,
+        form.fields.front());
     OnDidGetRealPan(AutofillClient::PaymentsRpcResult::kSuccess,
                     "6011000990139424");
     browser_autofill_manager_->OnFormSubmitted(
@@ -7120,8 +7125,9 @@
     browser_autofill_manager_->OnAskForValuesToFill(
         0, form, field, gfx::RectF(), /*autoselect_first_suggestion=*/false);
     std::string guid("10000000-0000-0000-0000-000000000002");  // masked card
-    browser_autofill_manager_->FillVirtualCardInformation(
-        guid, kDefaultPageID, form, form.fields.front());
+    browser_autofill_manager_->FillOrPreviewVirtualCardInformation(
+        mojom::RendererFormDataAction::kFill, guid, kDefaultPageID, form,
+        form.fields.front());
     OnDidGetRealPan(AutofillClient::PaymentsRpcResult::kSuccess,
                     "6011000990139424");
     browser_autofill_manager_->OnFormSubmitted(

components/autofill/core/browser/payments/autofill_credit_card_filling_infobar_delegate_mobile.cc

diff --git a/components/autofill/core/browser/payments/autofill_credit_card_filling_infobar_delegate_mobile.cc b/components/autofill/core/browser/payments/autofill_credit_card_filling_infobar_delegate_mobile.cc
index 7452164..0da7710 100644
--- a/components/autofill/core/browser/payments/autofill_credit_card_filling_infobar_delegate_mobile.cc
+++ b/components/autofill/core/browser/payments/autofill_credit_card_filling_infobar_delegate_mobile.cc
@@ -27,7 +27,7 @@
 #if defined(OS_IOS)
       card_label_(card.NetworkAndLastFourDigits()),
 #else
-      card_label_(std::u16string(kMidlineEllipsis4Dots) +
+      card_label_(CreditCard::GetMidlineEllipsisDots(4) +
                   card.LastFourDigits()),
 #endif
       card_sub_label_(card.AbbreviatedExpirationDateForDisplay(false)) {

components/autofill/core/browser/ui/autofill_popup_delegate.h

diff --git a/components/autofill/core/browser/ui/autofill_popup_delegate.h b/components/autofill/core/browser/ui/autofill_popup_delegate.h
index 46f4c610..beef2b4 100644
--- a/components/autofill/core/browser/ui/autofill_popup_delegate.h
+++ b/components/autofill/core/browser/ui/autofill_popup_delegate.h
@@ -33,8 +33,12 @@
 
   // Called when the autofill suggestion indicated by |frontend_id| has been
   // temporarily selected (e.g., hovered).
+  // |value| is the suggestion's value, and is usually the main text to be
+  // shown. |frontend_id| is the frontend id of the suggestion. |backend_id| is
+  // the guid of the backend data model.
   virtual void DidSelectSuggestion(const std::u16string& value,
-                                   int frontend_id) = 0;
+                                   int frontend_id,
+                                   const std::string& backend_id) = 0;
 
   // Inform the delegate that a row in the popup has been chosen. |value| is the
   // suggestion's value, and is usually the main text to be shown. |frontend_id|

components/browser_ui/styles/android/java/res/values/semantic_colors_dynamic.xml

diff --git a/components/browser_ui/styles/android/java/res/values/semantic_colors_dynamic.xml b/components/browser_ui/styles/android/java/res/values/semantic_colors_dynamic.xml
index 3ba75f9..d149a9fd 100644
--- a/components/browser_ui/styles/android/java/res/values/semantic_colors_dynamic.xml
+++ b/components/browser_ui/styles/android/java/res/values/semantic_colors_dynamic.xml
@@ -6,6 +6,7 @@
     <!-- Full dynamic colors ?attr version. Use for development. -->
     <!--
     <macro name="default_bg_color">?attr/colorSurface</macro>
+    <macro name="default_bg_color_elev_0">?attr/colorSurface</macro>
     <macro name="default_control_color_active">?attr/colorPrimary</macro>
     <macro name="default_control_color_normal">?attr/colorOnSurfaceVariant</macro>
     <macro name="default_icon_color">?attr/colorOnSurface</macro>
@@ -18,6 +19,7 @@
 
     <!-- Temporarily holdback @color version. Use for checkin. -->
     <macro name="default_bg_color">@color/default_bg_color_baseline</macro>
+    <macro name="default_bg_color_elev_0">@color/default_bg_color_elev_0_baseline</macro>
     <macro name="default_control_color_active">@color/default_control_color_active_baseline</macro>
     <macro name="default_control_color_normal">@color/default_control_color_normal_baseline</macro>
     <macro name="default_icon_color">@color/default_icon_color_baseline</macro>

components/browser_ui/styles/android/java/src/org/chromium/components/browser_ui/styles/SemanticColorUtils.java

diff --git a/components/browser_ui/styles/android/java/src/org/chromium/components/browser_ui/styles/SemanticColorUtils.java b/components/browser_ui/styles/android/java/src/org/chromium/components/browser_ui/styles/SemanticColorUtils.java
index 3664814..8a1921ef 100644
--- a/components/browser_ui/styles/android/java/src/org/chromium/components/browser_ui/styles/SemanticColorUtils.java
+++ b/components/browser_ui/styles/android/java/src/org/chromium/components/browser_ui/styles/SemanticColorUtils.java
@@ -9,6 +9,7 @@
 import androidx.annotation.AttrRes;
 import androidx.annotation.ColorInt;
 import androidx.annotation.ColorRes;
+import androidx.annotation.DimenRes;
 
 import com.google.android.material.color.MaterialColors;
 
@@ -31,6 +32,15 @@
         }
     }
 
+    private static @ColorInt int resolveSurfaceColorElev(
+            @DimenRes int elevationDimen, @ColorRes int colorRes, Context context) {
+        if (IS_FULL_DYNAMIC_COLORS) {
+            return ChromeColors.getSurfaceColor(context, elevationDimen);
+        } else {
+            return context.getResources().getColor(colorRes);
+        }
+    }
+
     /** Returns the semantic color value that corresponds to default_bg_color. */
     public static @ColorInt int getDefaultBgColor(Context context) {
         return resolve(R.attr.colorSurface, R.color.default_bg_color_baseline, context);
@@ -85,4 +95,15 @@
     public static @ColorInt int getProgressBarForeground(Context context) {
         return getDefaultControlColorActive(context);
     }
+
+    /** Returns the semantic color value that corresponds to default_bg_color_elev_2. */
+    public static @ColorInt int getDefaultBgColorElev2(Context context) {
+        return resolveSurfaceColorElev(
+                R.dimen.default_elevation_2, R.color.default_bg_color_elev_2_baseline, context);
+    }
+
+    /** Returns the semantic color value that corresponds to navigation_bubble_background_color. */
+    public static @ColorInt int getNavigationBubbleBackgroundColor(Context context) {
+        return getDefaultBgColorElev2(context);
+    }
 }

components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/dragreorder/DragReorderableListAdapter.java

diff --git a/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/dragreorder/DragReorderableListAdapter.java b/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/dragreorder/DragReorderableListAdapter.java
index 17894c9..16ba780 100644
--- a/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/dragreorder/DragReorderableListAdapter.java
+++ b/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/dragreorder/DragReorderableListAdapter.java
@@ -16,8 +16,8 @@
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.RecyclerView.ViewHolder;
 
-import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.ObserverList;
+import org.chromium.components.browser_ui.styles.ChromeColors;
 import org.chromium.components.browser_ui.widget.R;
 
 import java.util.Collections;
@@ -171,7 +171,7 @@
         Resources resource = context.getResources();
         // Set the alpha to 90% when dragging which is 230/255
         mDraggedBackgroundColor = ColorUtils.setAlphaComponent(
-                ApiCompatibilityUtils.getColor(resource, R.color.default_bg_color_elev_1),
+                ChromeColors.getSurfaceColor(mContext, R.dimen.default_elevation_1),
                 resource.getInteger(R.integer.list_item_dragged_alpha));
         mDraggedElevation = resource.getDimension(R.dimen.list_item_dragged_elevation);
     }

components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.cc

diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.cc
index 9d8538b..3801482a 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.cc
@@ -81,8 +81,7 @@
                         int64_t length,
                         base::ListValue* list_update) {
   int64_t value = GetInt64PrefValue(*list_update, index) + length;
-  list_update->Set(index,
-                   std::make_unique<base::Value>(base::NumberToString(value)));
+  list_update->GetList()[index] = base::Value(base::NumberToString(value));
 }
 
 void RecordSavingsClearedMetric(DataReductionProxySavingsClearedReason reason) {

components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats_unittest.cc

diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats_unittest.cc
index 254e98c9..61dcd11 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats_unittest.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats_unittest.cc
@@ -163,8 +163,8 @@
         compression_stats_->GetList(prefs::kDailyHttpReceivedContentLength);
 
     for (size_t i = 0; i < kNumDaysInHistory; ++i) {
-      original_daily_content_length_list->Set(
-          i, std::make_unique<base::Value>(base::NumberToString(i)));
+      original_daily_content_length_list->GetList()[i] =
+          base::Value(base::NumberToString(i));
     }
 
     received_daily_content_length_list->ClearList();

components/feature_engagement/public/android/java/src/org/chromium/components/feature_engagement/EventConstants.java

diff --git a/components/feature_engagement/public/android/java/src/org/chromium/components/feature_engagement/EventConstants.java b/components/feature_engagement/public/android/java/src/org/chromium/components/feature_engagement/EventConstants.java
index e1e93b2..33b86ce3 100644
--- a/components/feature_engagement/public/android/java/src/org/chromium/components/feature_engagement/EventConstants.java
+++ b/components/feature_engagement/public/android/java/src/org/chromium/components/feature_engagement/EventConstants.java
@@ -287,6 +287,10 @@
     public static final String SHOPPING_LIST_PRICE_TRACK_FROM_MENU =
             "shopping_list_track_price_from_menu";
 
+    /** A tap on the folder icon in the enhanced bookmark save flow. */
+    public static final String SHOPPING_LIST_SAVE_FLOW_FOLDER_TAP =
+            "shopping_list_save_flow_folder_tap";
+
     /**
      * Do not instantiate.
      */

components/feature_engagement/public/android/java/src/org/chromium/components/feature_engagement/FeatureConstants.java

diff --git a/components/feature_engagement/public/android/java/src/org/chromium/components/feature_engagement/FeatureConstants.java b/components/feature_engagement/public/android/java/src/org/chromium/components/feature_engagement/FeatureConstants.java
index cd6aa72..9e6e10e0 100644
--- a/components/feature_engagement/public/android/java/src/org/chromium/components/feature_engagement/FeatureConstants.java
+++ b/components/feature_engagement/public/android/java/src/org/chromium/components/feature_engagement/FeatureConstants.java
@@ -46,6 +46,7 @@
         FeatureConstants.DOWNLOAD_INFOBAR_DOWNLOADS_ARE_FASTER_FEATURE,
         FeatureConstants.NEW_TAB_PAGE_HOME_BUTTON_FEATURE,
         FeatureConstants.SHOPPING_LIST_MENU_ITEM_FEATURE,
+        FeatureConstants.SHOPPING_LIST_SAVE_FLOW_FEATURE,
         FeatureConstants.TAB_GROUPS_QUICKLY_COMPARE_PAGES_FEATURE,
         FeatureConstants.TAB_GROUPS_TAP_TO_SEE_ANOTHER_TAB_FEATURE,
         FeatureConstants.TAB_GROUPS_YOUR_TABS_ARE_TOGETHER_FEATURE,
@@ -172,6 +173,9 @@
     /** An IPH feature to prompt users to open the new tab page after a navigation. */
     String NEW_TAB_PAGE_HOME_BUTTON_FEATURE = "IPH_NewTabPageHomeButton";
 
+    /** An IPH that shows in the bookmark save flow when bookmarking a product. */
+    String SHOPPING_LIST_SAVE_FLOW_FEATURE = "IPH_ShoppingListSaveFlow";
+
     /**
      * An IPH that shows when a page is detected to be shopping related that shows the user a menu
      * item is available to track price.

components/feature_engagement/public/feature_constants.cc

diff --git a/components/feature_engagement/public/feature_constants.cc b/components/feature_engagement/public/feature_constants.cc
index 48d9423..1785b43e 100644
--- a/components/feature_engagement/public/feature_constants.cc
+++ b/components/feature_engagement/public/feature_constants.cc
@@ -126,6 +126,8 @@
     "IPH_ReadLaterAppMenuBookmarks", base::FEATURE_DISABLED_BY_DEFAULT};
 const base::Feature kIPHReadLaterBottomSheetFeature{
     "IPH_ReadLaterBottomSheet", base::FEATURE_ENABLED_BY_DEFAULT};
+const base::Feature kIPHShoppingListSaveFlowFeature{
+    "IPH_ShoppingListSaveFlow", base::FEATURE_ENABLED_BY_DEFAULT};
 const base::Feature kIPHEphemeralTabFeature{"IPH_EphemeralTab",
                                             base::FEATURE_DISABLED_BY_DEFAULT};
 const base::Feature

components/feature_engagement/public/feature_constants.h

diff --git a/components/feature_engagement/public/feature_constants.h b/components/feature_engagement/public/feature_constants.h
index 23c93f7f5..cbaaf7b 100644
--- a/components/feature_engagement/public/feature_constants.h
+++ b/components/feature_engagement/public/feature_constants.h
@@ -119,6 +119,7 @@
 extern const base::Feature kIPHReadLaterAppMenuBookmarksFeature;
 extern const base::Feature kIPHReadLaterBottomSheetFeature;
 extern const base::Feature kIPHShoppingListMenuItemFeature;
+extern const base::Feature kIPHShoppingListSaveFlowFeature;
 extern const base::Feature kIPHTabGroupsQuicklyComparePagesFeature;
 extern const base::Feature kIPHTabGroupsTapToSeeAnotherTabFeature;
 extern const base::Feature kIPHTabGroupsYourTabsAreTogetherFeature;

components/feature_engagement/public/feature_list.cc

diff --git a/components/feature_engagement/public/feature_list.cc b/components/feature_engagement/public/feature_list.cc
index 4f5a1be..ec411a5 100644
--- a/components/feature_engagement/public/feature_list.cc
+++ b/components/feature_engagement/public/feature_list.cc
@@ -69,6 +69,7 @@
     &kIPHReadLaterAppMenuBookmarksFeature,
     &kIPHReadLaterBottomSheetFeature,
     &kIPHShoppingListMenuItemFeature,
+    &kIPHShoppingListSaveFlowFeature,
     &kIPHTabGroupsQuicklyComparePagesFeature,
     &kIPHTabGroupsTapToSeeAnotherTabFeature,
     &kIPHTabGroupsYourTabsAreTogetherFeature,

components/feature_engagement/public/feature_list.h

diff --git a/components/feature_engagement/public/feature_list.h b/components/feature_engagement/public/feature_list.h
index 5bcf5b5d..a750f07 100644
--- a/components/feature_engagement/public/feature_list.h
+++ b/components/feature_engagement/public/feature_list.h
@@ -150,6 +150,8 @@
                        "IPH_ReadLaterBottomSheet");
 DEFINE_VARIATION_PARAM(kIPHShoppingListMenuItemFeature,
                        "IPH_ShoppingListMenuItem");
+DEFINE_VARIATION_PARAM(kIPHShoppingListSaveFlowFeature,
+                       "IPH_ShoppingListSaveFlow");
 DEFINE_VARIATION_PARAM(kIPHTabGroupsQuicklyComparePagesFeature,
                        "IPH_TabGroupsQuicklyComparePages");
 DEFINE_VARIATION_PARAM(kIPHTabGroupsTapToSeeAnotherTabFeature,
@@ -301,6 +303,7 @@
         VARIATION_ENTRY(kIPHReadLaterAppMenuBookmarksFeature),
         VARIATION_ENTRY(kIPHReadLaterBottomSheetFeature),
         VARIATION_ENTRY(kIPHShoppingListMenuItemFeature),
+        VARIATION_ENTRY(kIPHShoppingListSaveFlowFeature),
         VARIATION_ENTRY(kIPHTabGroupsQuicklyComparePagesFeature),
         VARIATION_ENTRY(kIPHTabGroupsTapToSeeAnotherTabFeature),
         VARIATION_ENTRY(kIPHTabGroupsYourTabsAreTogetherFeature),

components/language/content/browser/geo_language_provider.cc

diff --git a/components/language/content/browser/geo_language_provider.cc b/components/language/content/browser/geo_language_provider.cc
index 90773bf..8fbf0ba 100644
--- a/components/language/content/browser/geo_language_provider.cc
+++ b/components/language/content/browser/geo_language_provider.cc
@@ -198,8 +198,8 @@
   languages_ = languages;
 
   base::ListValue cache_list;
-  for (size_t i = 0; i < languages_.size(); ++i) {
-    cache_list.Set(i, std::make_unique<base::Value>(languages_[i]));
+  for (const std::string& language : languages_) {
+    cache_list.Append(language);
   }
   prefs_->Set(kCachedGeoLanguagesPref, cache_list);
 }

components/language/content/browser/geo_language_provider_unittest.cc

diff --git a/components/language/content/browser/geo_language_provider_unittest.cc b/components/language/content/browser/geo_language_provider_unittest.cc
index 7c37460..a1e988d 100644
--- a/components/language/content/browser/geo_language_provider_unittest.cc
+++ b/components/language/content/browser/geo_language_provider_unittest.cc
@@ -65,8 +65,8 @@
 
   void SetUpCachedLanguages(const std::vector<std::string>& languages) {
     base::ListValue cache_list;
-    for (size_t i = 0; i < languages.size(); ++i) {
-      cache_list.Set(i, std::make_unique<base::Value>(languages[i]));
+    for (const std::string& language : languages) {
+      cache_list.Append(language);
     }
     local_state_.Set(GeoLanguageProvider::kCachedGeoLanguagesPref, cache_list);
   }

components/nacl/common/BUILD.gn

diff --git a/components/nacl/common/BUILD.gn b/components/nacl/common/BUILD.gn
index c39d5ed7..12a1022a 100644
--- a/components/nacl/common/BUILD.gn
+++ b/components/nacl/common/BUILD.gn
@@ -62,8 +62,6 @@
     sources = [
       "nacl_host_messages.cc",
       "nacl_host_messages.h",
-      "nacl_nonsfi_util.cc",
-      "nacl_nonsfi_util.h",
       "pnacl_types.cc",
       "pnacl_types.h",
     ]

components/nacl/common/nacl_nonsfi_util.cc

diff --git a/components/nacl/common/nacl_nonsfi_util.cc b/components/nacl/common/nacl_nonsfi_util.cc
deleted file mode 100644
index f1a38ef..0000000
--- a/components/nacl/common/nacl_nonsfi_util.cc
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "components/nacl/common/nacl_nonsfi_util.h"
-
-#include "base/command_line.h"
-#include "build/build_config.h"
-#include "build/chromeos_buildflags.h"
-#include "components/nacl/common/nacl_switches.h"
-
-namespace nacl {
-
-// TODO(crbug.com/1273132): Remove.
-bool IsNonSFIModeEnabled() {
-  return false;
-}
-
-}  // namespace nacl

components/nacl/common/nacl_nonsfi_util.h

diff --git a/components/nacl/common/nacl_nonsfi_util.h b/components/nacl/common/nacl_nonsfi_util.h
deleted file mode 100644
index 07c033f..0000000
--- a/components/nacl/common/nacl_nonsfi_util.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef COMPONENTS_NACL_COMMON_NACL_NONSFI_UTIL_H_
-#define COMPONENTS_NACL_COMMON_NACL_NONSFI_UTIL_H_
-
-namespace nacl {
-
-// Returns true if non-SFI mode *can* run on the current platform and if non-SFI
-// manifest entries are preferred.  There can be other restrictions which
-// prevent a particular module from launching.  See NaClProcessHost::Launch
-// which makes the final determination.
-bool IsNonSFIModeEnabled();
-
-}  // namespace nacl
-
-#endif  // COMPONENTS_NACL_COMMON_NACL_NONSFI_UTIL_H_

components/nacl/renderer/json_manifest.cc

diff --git a/components/nacl/renderer/json_manifest.cc b/components/nacl/renderer/json_manifest.cc
index ac7435b..e8a0a5e 100644
--- a/components/nacl/renderer/json_manifest.cc
+++ b/components/nacl/renderer/json_manifest.cc
@@ -27,11 +27,8 @@
 
 // ISA Dictionary keys
 const char kX8632Key[] = "x86-32";
-const char kX8632NonSFIKey[] = "x86-32-nonsfi";
 const char kX8664Key[] = "x86-64";
-const char kX8664NonSFIKey[] = "x86-64-nonsfi";
 const char kArmKey[] = "arm";
-const char kArmNonSFIKey[] = "arm-nonsfi";
 const char kPortableKey[] = "portable";
 
 // Url Resolution keys
@@ -91,11 +88,6 @@
 //   }
 // }
 
-// Returns the key for the architecture in non-SFI mode.
-std::string GetNonSFIKey(const std::string& sandbox_isa) {
-  return sandbox_isa + "-nonsfi";
-}
-
 // Looks up |property_name| in the vector |valid_names| with length
 // |valid_name_count|.  Returns true if |property_name| is found.
 bool FindMatchingProperty(const std::string& property_name,
@@ -266,7 +258,6 @@
                           const std::string& parent_key,
                           const std::string& sandbox_isa,
                           bool must_find_matching_entry,
-                          bool nonsfi_enabled,
                           JsonManifest::ErrorInfo* error_info) {
   const base::DictionaryValue* dictionary = nullptr;
   if (!parent_dictionary.GetDictionaryWithoutPathExpansion(parent_key,
@@ -289,17 +280,11 @@
   } else {
     // The known values for NaCl ISA dictionaries in the manifest.
     static const char* kNaClManifestISAProperties[] = {
-      kX8632Key,
-      kX8632NonSFIKey,
-      kX8664Key,
-      kX8664NonSFIKey,
-      kArmKey,
-      kArmNonSFIKey,
-      // "portable" is here to allow checking that, if present, it can
-      // only refer to an URL, such as for a data file, and not to
-      // "pnacl-translate", which would cause the creation of a nexe.
-      kPortableKey
-    };
+        kX8632Key, kX8664Key, kArmKey,
+        // "portable" is here to allow checking that, if present, it can
+        // only refer to an URL, such as for a data file, and not to
+        // "pnacl-translate", which would cause the creation of a nexe.
+        kPortableKey};
     isaProperties = kNaClManifestISAProperties;
     isaPropertiesLength = base::size(kNaClManifestISAProperties);
   }
@@ -360,11 +345,9 @@
     // TODO(elijahtaylor) add ISA resolver here if we expand ISAs to include
     // micro-architectures that can resolve to multiple valid sandboxes.
     bool has_isa = dictionary->HasKey(sandbox_isa);
-    bool has_nonsfi_isa =
-        nonsfi_enabled && dictionary->HasKey(GetNonSFIKey(sandbox_isa));
     bool has_portable = dictionary->HasKey(kPortableKey);
 
-    if (!has_isa && !has_nonsfi_isa && !has_portable) {
+    if (!has_isa && !has_portable) {
       error_info->error = PP_NACL_ERROR_MANIFEST_PROGRAM_MISSING_ARCH;
       error_info->string = "manifest: no version of " + parent_key +
           " given for current arch and no portable version found.";
@@ -397,12 +380,10 @@
 
 JsonManifest::JsonManifest(const std::string& manifest_base_url,
                            const std::string& sandbox_isa,
-                           bool nonsfi_enabled,
                            bool pnacl_debug)
     : manifest_base_url_(manifest_base_url),
       sandbox_isa_(sandbox_isa),
-      nonsfi_enabled_(nonsfi_enabled),
-      pnacl_debug_(pnacl_debug) { }
+      pnacl_debug_(pnacl_debug) {}
 
 JsonManifest::~JsonManifest() {}
 
@@ -438,17 +419,15 @@
 
 bool JsonManifest::GetProgramURL(std::string* full_url,
                                  PP_PNaClOptions* pnacl_options,
-                                 bool* uses_nonsfi_mode,
                                  ErrorInfo* error_info) const {
   if (!full_url)
     return false;
   CHECK(pnacl_options);
-  CHECK(uses_nonsfi_mode);
   CHECK(error_info);
 
   std::string nexe_url;
   if (!GetURLFromISADictionary(*dictionary_, kProgramKey, &nexe_url,
-                               pnacl_options, uses_nonsfi_mode, error_info)) {
+                               pnacl_options, error_info)) {
     return false;
   }
 
@@ -534,7 +513,7 @@
   // There must be a matching (portable or sandbox_isa_) entry for program for
   // NaCl.
   if (!IsValidISADictionary(*dictionary_, kProgramKey, sandbox_isa_, true,
-                            nonsfi_enabled_, error_info)) {
+                            error_info)) {
     return false;
   }
 
@@ -543,7 +522,7 @@
   // for NaCl.
   if (dictionary_->HasKey(kInterpreterKey)) {
     if (!IsValidISADictionary(*dictionary_, kInterpreterKey, sandbox_isa_, true,
-                              nonsfi_enabled_, error_info)) {
+                              error_info)) {
       return false;
     }
   }
@@ -564,7 +543,7 @@
          it.Advance()) {
       const std::string& file_name = it.key();
       if (!IsValidISADictionary(*files_dictionary, file_name, sandbox_isa_,
-                                false, nonsfi_enabled_, error_info)) {
+                                false, error_info)) {
         return false;
       }
     }
@@ -582,10 +561,9 @@
     return false;
   }
   std::string relative_url;
-  bool uses_nonsfi_mode;
   ErrorInfo ignored_error_info;
   if (!GetURLFromISADictionary(dictionary, key, &relative_url, pnacl_options,
-                               &uses_nonsfi_mode, &ignored_error_info))
+                               &ignored_error_info))
     return false;
 
   // The contents of the manifest are resolved relative to the manifest URL.
@@ -604,7 +582,6 @@
     const std::string& parent_key,
     std::string* url,
     PP_PNaClOptions* pnacl_options,
-    bool* uses_nonsfi_mode,
     ErrorInfo* error_info) const {
   DCHECK(url && pnacl_options && error_info);
 
@@ -621,7 +598,7 @@
   // a matching entry (sandbox_isa_ or portable) for NaCl.
   ErrorInfo ignored_error_info;
   if (!IsValidISADictionary(parent_dictionary, parent_key, sandbox_isa_, true,
-                            nonsfi_enabled_, &ignored_error_info)) {
+                            &ignored_error_info)) {
     error_info->error = PP_NACL_ERROR_MANIFEST_RESOLVE_URL;
     error_info->string = "architecture " + sandbox_isa_ +
                          " is not found for file " + parent_key;
@@ -629,18 +606,12 @@
   }
 
   // The call to IsValidISADictionary() above guarantees that either
-  // sandbox_isa_, its nonsfi mode, or kPortableKey is present in the
-  // dictionary.
-  *uses_nonsfi_mode = false;
+  // sandbox_isa_ or kPortableKey is present in the dictionary.
   std::string chosen_isa;
   if (sandbox_isa_ == kPortableKey) {
     chosen_isa = kPortableKey;
   } else {
-    std::string nonsfi_isa = GetNonSFIKey(sandbox_isa_);
-    if (nonsfi_enabled_ && dictionary->HasKey(nonsfi_isa)) {
-      chosen_isa = nonsfi_isa;
-      *uses_nonsfi_mode = true;
-    } else if (dictionary->HasKey(sandbox_isa_)) {
+    if (dictionary->HasKey(sandbox_isa_)) {
       chosen_isa = sandbox_isa_;
     } else if (dictionary->HasKey(kPortableKey)) {
       chosen_isa = kPortableKey;

components/nacl/renderer/json_manifest.h

diff --git a/components/nacl/renderer/json_manifest.h b/components/nacl/renderer/json_manifest.h
index 2c371c6..6c9067b2 100644
--- a/components/nacl/renderer/json_manifest.h
+++ b/components/nacl/renderer/json_manifest.h
@@ -26,7 +26,6 @@
 
   JsonManifest(const std::string& manifest_base_url,
                const std::string& sandbox_isa,
-               bool nonsfi_enabled,
                bool pnacl_debug);
   ~JsonManifest();
 
@@ -38,7 +37,6 @@
   // manifest file.
   bool GetProgramURL(std::string* full_url,
                      PP_PNaClOptions* pnacl_options,
-                     bool* uses_nonsfi_mode,
                      ErrorInfo* error_info) const;
 
   // Gets all the keys and their URLs in the "files" section that are
@@ -64,12 +62,10 @@
                                const std::string& parent_key,
                                std::string* url,
                                PP_PNaClOptions* pnacl_options,
-                               bool* uses_nonsfi_mode,
                                ErrorInfo* error_info) const;
 
   std::string manifest_base_url_;
   std::string sandbox_isa_;
-  bool nonsfi_enabled_;
   bool pnacl_debug_;
 
   // The dictionary of manifest information parsed in Init().

components/nacl/renderer/ppb_nacl_private_impl.cc

diff --git a/components/nacl/renderer/ppb_nacl_private_impl.cc b/components/nacl/renderer/ppb_nacl_private_impl.cc
index 4098b32..66eb512 100644
--- a/components/nacl/renderer/ppb_nacl_private_impl.cc
+++ b/components/nacl/renderer/ppb_nacl_private_impl.cc
@@ -32,7 +32,6 @@
 #include "build/build_config.h"
 #include "components/nacl/common/nacl_host_messages.h"
 #include "components/nacl/common/nacl_messages.h"
-#include "components/nacl/common/nacl_nonsfi_util.h"
 #include "components/nacl/common/nacl_switches.h"
 #include "components/nacl/common/nacl_types.h"
 #include "components/nacl/renderer/file_downloader.h"
@@ -247,12 +246,8 @@
             &nacl_plugin_instance->nexe_load_manager;
         std::string full_url;
         PP_PNaClOptions pnacl_options;
-        bool uses_nonsfi_mode;
         JsonManifest::ErrorInfo error_info;
-        if (manifest->GetProgramURL(&full_url,
-                                    &pnacl_options,
-                                    &uses_nonsfi_mode,
-                                    &error_info)) {
+        if (manifest->GetProgramURL(&full_url, &pnacl_options, &error_info)) {
           int64_t exe_size = nacl_plugin_instance->pexe_size;
           if (exe_size == 0)
             exe_size = load_manager->nexe_size();
@@ -1085,7 +1080,7 @@
     isa_type = GetSandboxArch();
 
   std::unique_ptr<nacl::JsonManifest> j(new nacl::JsonManifest(
-      manifest_url.c_str(), isa_type, IsNonSFIModeEnabled(),
+      manifest_url.c_str(), isa_type,
       PP_ToBool(NaClDebugEnabledForURL(manifest_url.c_str()))));
   JsonManifest::ErrorInfo error_info;
   if (j->Init(manifest_data.c_str(), &error_info)) {
@@ -1133,13 +1128,11 @@
   if (manifest == NULL)
     return PP_FALSE;
 
-  bool uses_nonsfi_mode;
   std::string full_url;
   JsonManifest::ErrorInfo error_info;
-  if (manifest->GetProgramURL(&full_url, pnacl_options, &uses_nonsfi_mode,
-                              &error_info)) {
+  if (manifest->GetProgramURL(&full_url, pnacl_options, &error_info)) {
     *pp_full_url = ppapi::StringVar::StringToPPVar(full_url);
-    *pp_uses_nonsfi_mode = PP_FromBool(uses_nonsfi_mode);
+    *pp_uses_nonsfi_mode = PP_FALSE;
     if (ShouldUseSubzero(pnacl_options)) {
       pnacl_options->use_subzero = PP_TRUE;
       // Subzero -O2 is closer to LLC -O0, so indicate -O2.

components/nacl/zygote/nacl_fork_delegate_linux.cc

diff --git a/components/nacl/zygote/nacl_fork_delegate_linux.cc b/components/nacl/zygote/nacl_fork_delegate_linux.cc
index 34c639e..10f72938 100644
--- a/components/nacl/zygote/nacl_fork_delegate_linux.cc
+++ b/components/nacl/zygote/nacl_fork_delegate_linux.cc
@@ -28,7 +28,6 @@
 #include "base/process/launch.h"
 #include "base/strings/string_split.h"
 #include "build/build_config.h"
-#include "components/nacl/common/nacl_nonsfi_util.h"
 #include "components/nacl/common/nacl_paths.h"
 #include "components/nacl/common/nacl_switches.h"
 #include "components/nacl/loader/nacl_helper_linux.h"
@@ -152,8 +151,9 @@
                             const bool enable_layer1_sandbox) {
   VLOG(1) << "NaClForkDelegate::Init()";
 
-  // Only launch the non-SFI helper process if non-SFI mode is enabled.
-  if (nonsfi_mode_ && !IsNonSFIModeEnabled()) {
+  // non-SFI mode is no longer supported.
+  // TODO(b/200965779): Clean up the code.
+  if (nonsfi_mode_) {
     return;
   }
 

components/omnibox/browser/omnibox_edit_model.cc

diff --git a/components/omnibox/browser/omnibox_edit_model.cc b/components/omnibox/browser/omnibox_edit_model.cc
index 76192c4..ab91f41 100644
--- a/components/omnibox/browser/omnibox_edit_model.cc
+++ b/components/omnibox/browser/omnibox_edit_model.cc
@@ -1615,10 +1615,6 @@
                      is_keyword_hint, additional_text);
 }
 
-// static
-const char OmniboxEditModel::kCutOrCopyAllTextHistogram[] =
-    "Omnibox.CutOrCopyAllText";
-
 void OmniboxEditModel::SetAccessibilityLabel(const AutocompleteMatch& match) {
   view_->SetAccessibilityLabel(view_->GetText(), match, true);
 }

components/omnibox/browser/omnibox_edit_model.h

diff --git a/components/omnibox/browser/omnibox_edit_model.h b/components/omnibox/browser/omnibox_edit_model.h
index 608b37f..ca5259a 100644
--- a/components/omnibox/browser/omnibox_edit_model.h
+++ b/components/omnibox/browser/omnibox_edit_model.h
@@ -407,9 +407,6 @@
   // Used for testing purposes only.
   std::u16string GetUserTextForTesting() const { return user_text_; }
 
-  // Name of the histogram tracking cut or copy omnibox commands.
-  static const char kCutOrCopyAllTextHistogram[];
-
   // Just forwards the call to the OmniboxView referred within.
   void SetAccessibilityLabel(const AutocompleteMatch& match);
 
@@ -492,8 +489,6 @@
       int* label_prefix_length = nullptr);
 
   // Invoked any time the result set of the controller changes.
-  // TODO(orinj): This method seems like a good candidate for removal; it is
-  // preserved here only to prevent possible behavior change while refactoring.
   void OnPopupResultChanged();
 
   // Lookup the bitmap for |result_index|. Returns nullptr if not found.

components/omnibox/browser/omnibox_popup_model_unittest.cc

diff --git a/components/omnibox/browser/omnibox_popup_model_unittest.cc b/components/omnibox/browser/omnibox_popup_model_unittest.cc
deleted file mode 100644
index 1513ac0..0000000
--- a/components/omnibox/browser/omnibox_popup_model_unittest.cc
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-

components/paint_preview/player/android/java/src/org/chromium/components/paintpreview/player/PlayerSwipeRefreshHandler.java

diff --git a/components/paint_preview/player/android/java/src/org/chromium/components/paintpreview/player/PlayerSwipeRefreshHandler.java b/components/paint_preview/player/android/java/src/org/chromium/components/paintpreview/player/PlayerSwipeRefreshHandler.java
index 42fb3aa..7bf3cb6b 100644
--- a/components/paint_preview/player/android/java/src/org/chromium/components/paintpreview/player/PlayerSwipeRefreshHandler.java
+++ b/components/paint_preview/player/android/java/src/org/chromium/components/paintpreview/player/PlayerSwipeRefreshHandler.java
@@ -11,6 +11,7 @@
 import androidx.annotation.NonNull;
 
 import org.chromium.base.TraceEvent;
+import org.chromium.components.browser_ui.styles.ChromeColors;
 import org.chromium.components.browser_ui.styles.SemanticColorUtils;
 import org.chromium.third_party.android.swiperefresh.SwipeRefreshLayout;
 
@@ -42,8 +43,8 @@
         mSwipeRefreshLayout.setLayoutParams(
                 new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
         // Use the same colors as {@link org.chromium.chrome.browser.SwipeRefreshHandler}.
-        mSwipeRefreshLayout.setProgressBackgroundColorSchemeResource(
-                org.chromium.ui.R.color.default_bg_color_elev_2);
+        mSwipeRefreshLayout.setProgressBackgroundColorSchemeColor(
+                ChromeColors.getSurfaceColor(context, org.chromium.ui.R.dimen.default_elevation_2));
         mSwipeRefreshLayout.setColorSchemeColors(
                 SemanticColorUtils.getDefaultControlColorActive(context));
         mSwipeRefreshLayout.setEnabled(true);

components/password_manager/core/browser/password_autofill_manager.cc

diff --git a/components/password_manager/core/browser/password_autofill_manager.cc b/components/password_manager/core/browser/password_autofill_manager.cc
index 76bf735..c06b0fe 100644
--- a/components/password_manager/core/browser/password_autofill_manager.cc
+++ b/components/password_manager/core/browser/password_autofill_manager.cc
@@ -365,8 +365,10 @@
 
 void PasswordAutofillManager::OnPopupSuppressed() {}
 
-void PasswordAutofillManager::DidSelectSuggestion(const std::u16string& value,
-                                                  int frontend_id) {
+void PasswordAutofillManager::DidSelectSuggestion(
+    const std::u16string& value,
+    int frontend_id,
+    const std::string& backend_id) {
   ClearPreviewedForm();
   if (frontend_id == autofill::POPUP_ITEM_ID_ALL_SAVED_PASSWORDS_ENTRY ||
       frontend_id == autofill::POPUP_ITEM_ID_PASSWORD_ACCOUNT_STORAGE_EMPTY ||

components/password_manager/core/browser/password_autofill_manager.h

diff --git a/components/password_manager/core/browser/password_autofill_manager.h b/components/password_manager/core/browser/password_autofill_manager.h
index 4095da6..c4599c8 100644
--- a/components/password_manager/core/browser/password_autofill_manager.h
+++ b/components/password_manager/core/browser/password_autofill_manager.h
@@ -54,7 +54,8 @@
   void OnPopupHidden() override;
   void OnPopupSuppressed() override;
   void DidSelectSuggestion(const std::u16string& value,
-                           int frontend_id) override;
+                           int frontend_id,
+                           const std::string& backend_id) override;
   void DidAcceptSuggestion(const std::u16string& value,
                            int frontend_id,
                            const std::string& backend_id,

components/password_manager/core/browser/password_autofill_manager_unittest.cc

diff --git a/components/password_manager/core/browser/password_autofill_manager_unittest.cc b/components/password_manager/core/browser/password_autofill_manager_unittest.cc
index 0bf3d5e..ed3bdaa 100644
--- a/components/password_manager/core/browser/password_autofill_manager_unittest.cc
+++ b/components/password_manager/core/browser/password_autofill_manager_unittest.cc
@@ -1227,8 +1227,8 @@
   // Check that preview of the empty username works.
   EXPECT_CALL(*client.mock_driver(),
               PreviewSuggestion(std::u16string(), test_password_));
-  password_autofill_manager_->DidSelectSuggestion(no_username_string,
-                                                  0 /*not used*/);
+  password_autofill_manager_->DidSelectSuggestion(
+      no_username_string, 0 /*not used*/, std::string() /*not used*/);
   testing::Mock::VerifyAndClearExpectations(client.mock_driver());
 
   // Check that fill of the empty username works.
@@ -1831,7 +1831,8 @@
   EXPECT_CALL(*client.mock_driver(),
               PreviewSuggestion(kName, /*password=*/std::u16string(u"")));
   password_autofill_manager_->DidSelectSuggestion(
-      kName, autofill::POPUP_ITEM_ID_WEBAUTHN_CREDENTIAL);
+      kName, autofill::POPUP_ITEM_ID_WEBAUTHN_CREDENTIAL,
+      std::string() /*not used*/);
   testing::Mock::VerifyAndClearExpectations(client.mock_driver());
 
   // Check that selecting the credential reports back to the client.

components/policy/resources/policy_templates.json

diff --git a/components/policy/resources/policy_templates.json b/components/policy/resources/policy_templates.json
index faf2634d..a12870a7 100644
--- a/components/policy/resources/policy_templates.json
+++ b/components/policy/resources/policy_templates.json
@@ -24629,7 +24629,7 @@
       'id': 893,
       'caption': '''Block Browser Legacy Extension Points''',
       'tags': ['system-security'],
-      'desc': '''Setting the policy to Enabled or leaving it unset will enable <ph name="LEGACY_EXTENSION_DISABLE_API">ProcessExtensionPointDisablePolicy</ph> to block legacy extension points in the Browser process.
+      'desc': '''Setting the policy to Enabled or leaving it unset will permit <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> to apply the additional extension point security mitigation to block legacy extension points in the Browser process.
 
       Setting the policy to Disabled has a detrimental effect on <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>'s security and stability as unknown and potentially hostile code can load inside <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>'s browser process. Only turn off the policy if there are compatibility issues with third-party software that must run inside <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>'s browser process.
 

components/sync/driver/glue/sync_engine_backend.cc

diff --git a/components/sync/driver/glue/sync_engine_backend.cc b/components/sync/driver/glue/sync_engine_backend.cc
index a277a44..4754cf8 100644
--- a/components/sync/driver/glue/sync_engine_backend.cc
+++ b/components/sync/driver/glue/sync_engine_backend.cc
@@ -214,8 +214,7 @@
   sync_encryption_handler_ = std::make_unique<NigoriSyncBridgeImpl>(
       std::move(nigori_processor),
       std::make_unique<NigoriStorageImpl>(
-          sync_data_folder_.Append(kNigoriStorageFilename)),
-      params.encryption_bootstrap_token);
+          sync_data_folder_.Append(kNigoriStorageFilename)));
 
   sync_manager_ = params.sync_manager_factory->CreateSyncManager(name_);
   sync_manager_->AddObserver(this);

components/sync/engine/sync_engine.h

diff --git a/components/sync/engine/sync_engine.h b/components/sync/engine/sync_engine.h
index 2987b3e..580bc7a 100644
--- a/components/sync/engine/sync_engine.h
+++ b/components/sync/engine/sync_engine.h
@@ -68,9 +68,6 @@
     bool enable_local_sync_backend = false;
     base::FilePath local_sync_backend_folder;
     std::unique_ptr<EngineComponentsFactory> engine_components_factory;
-    // TODO(crbug.com/1276958): this field is already never initialized, clean
-    // up the related code and remove the field.
-    std::string encryption_bootstrap_token;
   };
 
   SyncEngine();

components/sync/nigori/nigori_sync_bridge_impl.cc

diff --git a/components/sync/nigori/nigori_sync_bridge_impl.cc b/components/sync/nigori/nigori_sync_bridge_impl.cc
index 74d3dfb..e58e1da9 100644
--- a/components/sync/nigori/nigori_sync_bridge_impl.cc
+++ b/components/sync/nigori/nigori_sync_bridge_impl.cc
@@ -246,31 +246,6 @@
   return encoded_key;
 }
 
-// Unpacks explicit passphrase keys. Returns a populated sync_pb::NigoriKey if
-// successful, or an empty instance (i.e. default value) if |packed_key| is
-// empty or decoding/decryption errors occur.
-sync_pb::NigoriKey UnpackExplicitPassphraseKey(const std::string& packed_key) {
-  if (packed_key.empty()) {
-    return sync_pb::NigoriKey();
-  }
-
-  std::string decoded_key;
-  if (!base::Base64Decode(packed_key, &decoded_key)) {
-    DLOG(ERROR) << "Failed to decode explicit passphrase key.";
-    return sync_pb::NigoriKey();
-  }
-
-  std::string decrypted_key;
-  if (!OSCrypt::DecryptString(decoded_key, &decrypted_key)) {
-    DLOG(ERROR) << "Failed to decrypt expliciti passphrase key.";
-    return sync_pb::NigoriKey();
-  }
-
-  sync_pb::NigoriKey key;
-  key.ParseFromString(decrypted_key);
-  return key;
-}
-
 }  // namespace
 
 class NigoriSyncBridgeImpl::BroadcastingObserver
@@ -359,12 +334,9 @@
 
 NigoriSyncBridgeImpl::NigoriSyncBridgeImpl(
     std::unique_ptr<NigoriLocalChangeProcessor> processor,
-    std::unique_ptr<NigoriStorage> storage,
-    const std::string& packed_explicit_passphrase_key)
+    std::unique_ptr<NigoriStorage> storage)
     : processor_(std::move(processor)),
       storage_(std::move(storage)),
-      explicit_passphrase_key_(
-          UnpackExplicitPassphraseKey(packed_explicit_passphrase_key)),
       broadcasting_observer_(std::make_unique<BroadcastingObserver>(
           // base::Unretained() legit because the observer gets destroyed
           // together with |this|.
@@ -835,17 +807,6 @@
     decryption_key_bag.AddKeyFromProto(*keystore_decryptor_key);
   }
 
-  // TODO(crbug.com/1057655, crbug.com/1020084): This should be allowed for
-  // KEYSTORE_PASSPHRASE and disallowed for TRUSTED_VAULT_PASSPHRASE, keep
-  // temporarily as is to avoid behavioral changes.
-  if (state_.passphrase_type != NigoriSpecifics::KEYSTORE_PASSPHRASE) {
-    // Note: key derived from explicit passphrase was stored in prefs prior to
-    // USS, and using |explicit_passphrase_key_| here effectively does
-    // migration. If |explicit_passphrase_key_| is empty, following line is
-    // no-op.
-    decryption_key_bag.AddKeyFromProto(explicit_passphrase_key_);
-  }
-
   // TODO(crbug.com/1057655): this should be allowed for KEYSTORE_PASSPHRASE,
   // but should be disallowed if |passphrase_type| was changed in current
   // update.
@@ -935,15 +896,7 @@
 
 void NigoriSyncBridgeImpl::ApplyDisableSyncChanges() {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-  // The user intended to disable sync, so we need to clear all the data, except
-  // |explicit_passphrase_key_| in memory, because this function can be called
-  // due to BackendMigrator. It's safe even if this function called due to
-  // actual disabling sync, since we remove the persisted key by clearing sync
-  // prefs explicitly, and don't reuse current instance of the bridge after
-  // that.
-  // TODO(crbug.com/922900): idea with keeping
-  // |explicit_passphrase_key_| will become not working, once we clean up
-  // storing explicit passphrase key in prefs, we need to find better solution.
+
   storage_->ClearData();
   state_.keystore_keys_cryptographer = KeystoreKeysCryptographer::CreateEmpty();
   state_.cryptographer->ClearAllKeys();

components/sync/nigori/nigori_sync_bridge_impl.h

diff --git a/components/sync/nigori/nigori_sync_bridge_impl.h b/components/sync/nigori/nigori_sync_bridge_impl.h
index 776abe3..b961af6 100644
--- a/components/sync/nigori/nigori_sync_bridge_impl.h
+++ b/components/sync/nigori/nigori_sync_bridge_impl.h
@@ -48,8 +48,7 @@
                              public SyncEncryptionHandler {
  public:
   NigoriSyncBridgeImpl(std::unique_ptr<NigoriLocalChangeProcessor> processor,
-                       std::unique_ptr<NigoriStorage> storage,
-                       const std::string& packed_explicit_passphrase_key);
+                       std::unique_ptr<NigoriStorage> storage);
 
   NigoriSyncBridgeImpl(const NigoriSyncBridgeImpl&) = delete;
   NigoriSyncBridgeImpl& operator=(const NigoriSyncBridgeImpl&) = delete;
@@ -164,11 +163,6 @@
   const std::unique_ptr<NigoriLocalChangeProcessor> processor_;
   const std::unique_ptr<NigoriStorage> storage_;
 
-  // Stores a key derived from explicit passphrase and loaded from the prefs.
-  // Empty (i.e. default value) if prefs doesn't contain this key or in case of
-  // decryption/decoding errors.
-  const sync_pb::NigoriKey explicit_passphrase_key_;
-
   syncer::NigoriState state_;
 
   std::list<std::unique_ptr<PendingLocalNigoriCommit>>

components/sync/nigori/nigori_sync_bridge_impl_unittest.cc

diff --git a/components/sync/nigori/nigori_sync_bridge_impl_unittest.cc b/components/sync/nigori/nigori_sync_bridge_impl_unittest.cc
index e322a87..a4e2f1b 100644
--- a/components/sync/nigori/nigori_sync_bridge_impl_unittest.cc
+++ b/components/sync/nigori/nigori_sync_bridge_impl_unittest.cc
@@ -147,12 +147,6 @@
          expected.entity_metadata->SerializeAsString();
 }
 
-std::string PackKeyAsExplicitPassphrase(const KeyParamsForTesting& key_params) {
-  return NigoriSyncBridgeImpl::PackExplicitPassphraseKeyForTesting(
-      *CryptographerImpl::FromSingleKeyForTesting(
-          key_params.password, key_params.derivation_params));
-}
-
 NigoriMetadataBatch CreateDummyNigoriMetadataBatch(
     const std::string& progress_marker_token,
     int64_t entity_metadata_sequence_number) {
@@ -233,9 +227,8 @@
     processor_ = processor.get();
     auto storage = std::make_unique<testing::NiceMock<MockNigoriStorage>>();
     storage_ = storage.get();
-    bridge_ = std::make_unique<NigoriSyncBridgeImpl>(
-        std::move(processor), std::move(storage),
-        /*packed_explicit_passphrase_key=*/std::string());
+    bridge_ = std::make_unique<NigoriSyncBridgeImpl>(std::move(processor),
+                                                     std::move(storage));
     bridge_->AddObserver(&observer_);
   }
 
@@ -1022,40 +1015,6 @@
   bridge()->SetEncryptionPassphrase("new_passphrase");
 }
 
-// Tests that we can use packed explicit passphrase key passed to bridge to
-// decrypt custom passphrase NigoriSpecifics.
-TEST_F(NigoriSyncBridgeImplPersistenceTest,
-       ShouldDecryptWithExplicitPassphraseFromPrefs) {
-  const KeyParamsForTesting kKeyParams =
-      Pbkdf2PassphraseKeyParamsForTesting("passphrase");
-
-  auto processor =
-      std::make_unique<testing::NiceMock<MockNigoriLocalChangeProcessor>>();
-  auto bridge = std::make_unique<NigoriSyncBridgeImpl>(
-      std::move(processor),
-      std::make_unique<testing::NiceMock<MockNigoriStorage>>(),
-      PackKeyAsExplicitPassphrase(kKeyParams));
-  testing::NiceMock<MockObserver> observer;
-  bridge->AddObserver(&observer);
-
-  EntityData entity_data;
-  *entity_data.specifics.mutable_nigori() =
-      BuildCustomPassphraseNigoriSpecifics(kKeyParams);
-  const std::vector<uint8_t> kRawKeystoreKey = {0, 1, 2, 3, 4};
-  ASSERT_TRUE(bridge->SetKeystoreKeys({kRawKeystoreKey}));
-
-  EXPECT_CALL(observer,
-              OnCryptographerStateChanged(NotNull(),
-                                          /*has_pending_keys=*/false));
-  EXPECT_CALL(observer, OnPassphraseRequired).Times(0);
-  ASSERT_THAT(bridge->MergeSyncData(std::move(entity_data)), Eq(absl::nullopt));
-
-  EXPECT_THAT(*bridge->GetCryptographer(), CanDecryptWith(kKeyParams));
-  EXPECT_THAT(*bridge->GetCryptographer(),
-              HasDefaultKeyDerivedFrom(kKeyParams));
-  bridge->RemoveObserver(&observer);
-}
-
 TEST_F(NigoriSyncBridgeImplPersistenceTest, ShouldRestoreKeystoreNigori) {
   // Emulate storing on disc.
   auto storage1 = std::make_unique<testing::NiceMock<MockNigoriStorage>>();
@@ -1073,9 +1032,8 @@
                                           kDummySequenceNumber);
   });
 
-  auto bridge1 = std::make_unique<NigoriSyncBridgeImpl>(
-      std::move(processor1), std::move(storage1),
-      /*packed_explicit_passphrase_key=*/std::string());
+  auto bridge1 = std::make_unique<NigoriSyncBridgeImpl>(std::move(processor1),
+                                                        std::move(storage1));
 
   // Perform initial sync with simple keystore Nigori.
   const std::vector<uint8_t> kRawKeystoreKey = {0, 1, 2, 3, 4};
@@ -1109,9 +1067,8 @@
                        IsDummyNigoriMetadataBatchWithTokenAndSequenceNumber(
                            kDummyProgressMarkerToken, kDummySequenceNumber)));
 
-  auto bridge2 = std::make_unique<NigoriSyncBridgeImpl>(
-      std::move(processor2), std::move(storage2),
-      /*packed_explicit_passphrase_key=*/std::string());
+  auto bridge2 = std::make_unique<NigoriSyncBridgeImpl>(std::move(processor2),
+                                                        std::move(storage2));
 
   // Verify that we restored Cryptographer state.
   EXPECT_THAT(*bridge2->GetCryptographer(), CanDecryptWith(kKeystoreKeyParams));
@@ -1147,9 +1104,8 @@
   // Calling bridge constructor triggers a commit cycle but doesn't immediately
   // expose the new state, until the commit completes.
   EXPECT_CALL(*not_owned_processor, Put(HasKeystoreNigori()));
-  auto bridge = std::make_unique<NigoriSyncBridgeImpl>(
-      std::move(processor), std::move(storage),
-      /*packed_explicit_passphrase_key=*/std::string());
+  auto bridge = std::make_unique<NigoriSyncBridgeImpl>(std::move(processor),
+                                                       std::move(storage));
   EXPECT_THAT(bridge->GetData(), HasKeystoreNigori());
 
   // Emulate commit completeness.
@@ -1536,8 +1492,7 @@
 
   auto bridge1 = std::make_unique<NigoriSyncBridgeImpl>(
       std::make_unique<testing::NiceMock<MockNigoriLocalChangeProcessor>>(),
-      std::move(storage1),
-      /*packed_explicit_passphrase_key=*/std::string());
+      std::move(storage1));
 
   // Perform initial sync with trusted vault passphrase.
   const std::vector<uint8_t> kTrustedVaultKey = {2, 3, 4, 5, 6};
@@ -1581,9 +1536,8 @@
   // Once decryption passphrase is provided, bridge should ReportError().
   EXPECT_CALL(*processor2, ReportError);
 
-  auto bridge2 = std::make_unique<NigoriSyncBridgeImpl>(
-      std::move(processor2), std::move(storage2),
-      /*packed_explicit_passphrase_key=*/std::string());
+  auto bridge2 = std::make_unique<NigoriSyncBridgeImpl>(std::move(processor2),
+                                                        std::move(storage2));
 
   bridge2->SetExplicitPassphraseDecryptionKey(
       MakeNigoriKey(kCustomPassphraseKeyParams));
@@ -1632,8 +1586,7 @@
 
   auto bridge1 = std::make_unique<NigoriSyncBridgeImpl>(
       std::make_unique<testing::NiceMock<MockNigoriLocalChangeProcessor>>(),
-      std::move(storage1),
-      /*packed_explicit_passphrase_key=*/std::string());
+      std::move(storage1));
 
   // Perform initial sync with backward compatible keystore Nigori.
   const std::vector<uint8_t> kRawKeystoreKey = {0, 1, 2, 3, 4};
@@ -1660,9 +1613,8 @@
   // Upon startup bridge should issue a commit with full keystore Nigori.
   EXPECT_CALL(*processor2, Put(HasKeystoreNigori()));
 
-  auto bridge2 = std::make_unique<NigoriSyncBridgeImpl>(
-      std::move(processor2), std::move(storage2),
-      /*packed_explicit_passphrase_key=*/std::string());
+  auto bridge2 = std::make_unique<NigoriSyncBridgeImpl>(std::move(processor2),
+                                                        std::move(storage2));
 
   // Mimic commit completion.
   EXPECT_THAT(bridge2->ApplySyncChanges(absl::nullopt), Eq(absl::nullopt));
@@ -1688,8 +1640,7 @@
 
   auto bridge1 = std::make_unique<NigoriSyncBridgeImpl>(
       std::make_unique<testing::NiceMock<MockNigoriLocalChangeProcessor>>(),
-      std::move(storage1),
-      /*packed_explicit_passphrase_key=*/std::string());
+      std::move(storage1));
 
   // Perform initial sync with custom passphrase Nigori without keystore keys.
   const std::vector<uint8_t> kRawKeystoreKey = {0, 1, 2, 3, 4};
@@ -1714,9 +1665,8 @@
   // No commits should be issued.
   EXPECT_CALL(*processor2, Put).Times(0);
 
-  auto bridge2 = std::make_unique<NigoriSyncBridgeImpl>(
-      std::move(processor2), std::move(storage2),
-      /*packed_explicit_passphrase_key=*/std::string());
+  auto bridge2 = std::make_unique<NigoriSyncBridgeImpl>(std::move(processor2),
+                                                        std::move(storage2));
 
   EXPECT_THAT(*bridge2->GetCryptographer(),
               CanDecryptWith(KeystoreKeyParamsForTesting(kRawKeystoreKey)));

content/browser/bad_message.h

diff --git a/content/browser/bad_message.h b/content/browser/bad_message.h
index a885bf0..e5988f9 100644
--- a/content/browser/bad_message.h
+++ b/content/browser/bad_message.h
@@ -282,6 +282,7 @@
   RFPH_FOCUSED_FENCED_FRAME = 255,
   WCI_REQUEST_LOCK_MOUSE_FENCED_FRAME = 256,
   BFSI_CREATE_FOR_FRAME_FENCED_FRAME = 257,
+  RFH_FENCED_FRAME_MOJO_WHEN_DISABLED = 258,
 
   // Please add new elements here. The naming convention is abbreviated class
   // name (e.g. RenderFrameHost becomes RFH) plus a unique description of the

content/browser/child_process_security_policy_impl.cc

diff --git a/content/browser/child_process_security_policy_impl.cc b/content/browser/child_process_security_policy_impl.cc
index 2cf1911..b8f42c0 100644
--- a/content/browser/child_process_security_policy_impl.cc
+++ b/content/browser/child_process_security_policy_impl.cc
@@ -1203,8 +1203,8 @@
   // With site isolation, a URL from a site may only be committed in a process
   // dedicated to that site.  This check will ensure that |url| can't commit if
   // the process is locked to a different site.
-  if (!CanAccessDataForOrigin(child_id, url,
-                              false /* url_is_precursor_of_opaque_origin */))
+  if (!CanAccessDataForMaybeOpaqueOrigin(
+          child_id, url, false /* url_is_precursor_of_opaque_origin */))
     return false;
 
   {
@@ -1426,6 +1426,25 @@
                                          DELETE_FILE_GRANT);
 }
 
+bool ChildProcessSecurityPolicyImpl::CanMoveFileSystemFile(
+    int child_id,
+    const storage::FileSystemURL& src_url,
+    const storage::FileSystemURL& dest_url) {
+  return HasPermissionsForFileSystemFile(child_id, dest_url,
+                                         CREATE_NEW_FILE_GRANT) &&
+         HasPermissionsForFileSystemFile(child_id, src_url, READ_FILE_GRANT) &&
+         HasPermissionsForFileSystemFile(child_id, src_url, DELETE_FILE_GRANT);
+}
+
+bool ChildProcessSecurityPolicyImpl::CanCopyFileSystemFile(
+    int child_id,
+    const storage::FileSystemURL& src_url,
+    const storage::FileSystemURL& dest_url) {
+  return HasPermissionsForFileSystemFile(child_id, src_url, READ_FILE_GRANT) &&
+         HasPermissionsForFileSystemFile(child_id, dest_url,
+                                         COPY_INTO_FILE_GRANT);
+}
+
 bool ChildProcessSecurityPolicyImpl::HasWebUIBindings(int child_id) {
   base::AutoLock lock(lock_);
 
@@ -1516,6 +1535,7 @@
     int child_id,
     const url::Origin& origin) {
   GURL url_to_check;
+  DCHECK(IsRunningOnExpectedThread());
   if (origin.opaque()) {
     auto precursor_tuple = origin.GetTupleOrPrecursorTupleIfOpaque();
     if (!precursor_tuple.IsValid()) {
@@ -1533,8 +1553,8 @@
   } else {
     url_to_check = origin.GetURL();
   }
-  bool success =
-      CanAccessDataForOrigin(child_id, url_to_check, origin.opaque());
+  bool success = CanAccessDataForMaybeOpaqueOrigin(child_id, url_to_check,
+                                                   origin.opaque());
   if (success)
     return true;
 
@@ -1547,7 +1567,7 @@
   return false;
 }
 
-bool ChildProcessSecurityPolicyImpl::CanAccessDataForOrigin(
+bool ChildProcessSecurityPolicyImpl::CanAccessDataForMaybeOpaqueOrigin(
     int child_id,
     const GURL& url,
     bool url_is_precursor_of_opaque_origin) {

content/browser/child_process_security_policy_impl.h

diff --git a/content/browser/child_process_security_policy_impl.h b/content/browser/child_process_security_policy_impl.h
index b51e746..16c2745e 100644
--- a/content/browser/child_process_security_policy_impl.h
+++ b/content/browser/child_process_security_policy_impl.h
@@ -403,6 +403,12 @@
                                  const storage::FileSystemURL& filesystem_url);
   bool CanDeleteFileSystemFile(int child_id,
                                const storage::FileSystemURL& filesystem_url);
+  bool CanMoveFileSystemFile(int child_id,
+                             const storage::FileSystemURL& src_url,
+                             const storage::FileSystemURL& dest_url);
+  bool CanCopyFileSystemFile(int child_id,
+                             const storage::FileSystemURL& src_url,
+                             const storage::FileSystemURL& dest_url);
 
   // Returns true if the specified child_id has been granted ReadRawCookies.
   bool CanReadRawCookies(int child_id);
@@ -776,9 +782,10 @@
       const SecurityState* security_state);
 
   // Helper for public CanAccessDataForOrigin overloads.
-  bool CanAccessDataForOrigin(int child_id,
-                              const GURL& url,
-                              bool url_is_precursor_of_opaque_origin);
+  bool CanAccessDataForMaybeOpaqueOrigin(
+      int child_id,
+      const GURL& url,
+      bool url_is_precursor_of_opaque_origin);
 
   // Utility function to simplify lookups for OriginAgentClusterOptInEntry
   // values by origin.

content/browser/file_system/file_system_manager_impl.cc

diff --git a/content/browser/file_system/file_system_manager_impl.cc b/content/browser/file_system/file_system_manager_impl.cc
index bb1b34c..84ec2d0 100644
--- a/content/browser/file_system/file_system_manager_impl.cc
+++ b/content/browser/file_system/file_system_manager_impl.cc
@@ -24,7 +24,9 @@
 #include "content/browser/file_system/browser_file_system_helper.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/common/content_features.h"
 #include "ipc/ipc_platform_file.h"
+#include "mojo/public/cpp/bindings/receiver_set.h"
 #include "net/base/mime_util.h"
 #include "storage/browser/blob/blob_data_builder.h"
 #include "storage/browser/blob/blob_storage_context.h"
@@ -213,9 +215,29 @@
                                  OpenCallback callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
-  if (!security_policy_->CanAccessDataForOrigin(process_id_, origin)) {
+  content::GetUIThreadTaskRunner({})->PostTaskAndReplyWithResult(
+      FROM_HERE,
+      // security_policy_ is a singleton so refcounting is unnecessary
+      base::BindOnce(&ChildProcessSecurityPolicyImpl::CanAccessDataForOrigin,
+                     base::Unretained(security_policy_), process_id_, origin),
+      base::BindOnce(&FileSystemManagerImpl::ContinueOpen,
+                     weak_factory_.GetWeakPtr(), origin, file_system_type,
+                     receivers_.GetBadMessageCallback(), std::move(callback),
+                     receivers_.current_context()));
+}
+
+void FileSystemManagerImpl::ContinueOpen(
+    const url::Origin& origin,
+    blink::mojom::FileSystemType file_system_type,
+    mojo::ReportBadMessageCallback bad_message_callback,
+    OpenCallback callback,
+    const blink::StorageKey& storage_key,
+    bool security_check_success) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+
+  if (!security_check_success) {
     NOTREACHED();
-    receivers_.ReportBadMessage("FSMI_OPEN_INVALID_ORIGIN");
+    std::move(bad_message_callback).Run("FSMI_OPEN_INVALID_ORIGIN");
     return;
   }
 
@@ -225,7 +247,7 @@
     RecordAction(base::UserMetricsAction("OpenFileSystemPersistent"));
   }
   context_->OpenFileSystem(
-      receivers_.current_context(), ToStorageFileSystemType(file_system_type),
+      storage_key, ToStorageFileSystemType(file_system_type),
       storage::OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT,
       base::BindOnce(&FileSystemManagerImpl::DidOpenFileSystem, GetWeakPtr(),
                      std::move(callback)));
@@ -243,7 +265,21 @@
     return;
   }
 
-  if (!security_policy_->CanReadFileSystemFile(process_id_, url)) {
+  content::GetUIThreadTaskRunner({})->PostTaskAndReplyWithResult(
+      FROM_HERE,
+      // security_policy_ is a singleton so refcounting is unnecessary
+      base::BindOnce(&ChildProcessSecurityPolicyImpl::CanReadFileSystemFile,
+                     base::Unretained(security_policy_), process_id_, url),
+      base::BindOnce(&FileSystemManagerImpl::ContinueResolveURL,
+                     weak_factory_.GetWeakPtr(), url, std::move(callback)));
+}
+
+void FileSystemManagerImpl::ContinueResolveURL(
+    const storage::FileSystemURL& url,
+    ResolveURLCallback callback,
+    bool security_check_success) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  if (!security_check_success) {
     std::move(callback).Run(blink::mojom::FileSystemInfo::New(),
                             base::FilePath(), false,
                             base::File::FILE_ERROR_SECURITY);
@@ -270,19 +306,41 @@
     std::move(callback).Run(opt_error.value());
     return;
   }
-  if (!security_policy_->CanReadFileSystemFile(process_id_, src_url) ||
-      !security_policy_->CanDeleteFileSystemFile(process_id_, src_url) ||
-      !security_policy_->CanCreateFileSystemFile(process_id_, dest_url)) {
+  content::GetUIThreadTaskRunner({})->PostTaskAndReplyWithResult(
+      FROM_HERE,
+      // security_policy_ is a singleton so refcounting is unnecessary
+      base::BindOnce(&ChildProcessSecurityPolicyImpl::CanMoveFileSystemFile,
+                     base::Unretained(security_policy_), process_id_, src_url,
+                     dest_url),
+      base::BindOnce(&FileSystemManagerImpl::ContinueMove,
+                     weak_factory_.GetWeakPtr(), src_url, dest_url,
+                     std::move(callback)));
+}
+
+void FileSystemManagerImpl::ContinueMove(const storage::FileSystemURL& src_url,
+                                         const storage::FileSystemURL& dest_url,
+                                         MoveCallback callback,
+                                         bool security_check_success) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  if (!security_check_success) {
     std::move(callback).Run(base::File::FILE_ERROR_SECURITY);
     return;
   }
 
-  operation_runner()->Move(
-      src_url, dest_url, storage::FileSystemOperation::CopyOrMoveOptionSet(),
-      FileSystemOperation::ERROR_BEHAVIOR_ABORT,
-      storage::FileSystemOperation::CopyOrMoveProgressCallback(),
-      base::BindOnce(&FileSystemManagerImpl::DidFinish, GetWeakPtr(),
-                     std::move(callback)));
+  storage::FileSystemOperationRunner* fs_op_runner = operation_runner();
+  if (!fs_op_runner) {
+    /* A null FileSystemOperationRunner at this point means the corresponding
+     * renderer was terminated, so return early to ignore the requested
+     * FileSystemOperation. */
+    return;
+  }
+
+  fs_op_runner->Move(src_url, dest_url,
+                     storage::FileSystemOperation::CopyOrMoveOptionSet(),
+                     FileSystemOperation::ERROR_BEHAVIOR_ABORT,
+                     storage::FileSystemOperation::CopyOrMoveProgressCallback(),
+                     base::BindOnce(&FileSystemManagerImpl::DidFinish,
+                                    GetWeakPtr(), std::move(callback)));
 }
 
 void FileSystemManagerImpl::Copy(const GURL& src_path,
@@ -300,18 +358,42 @@
     std::move(callback).Run(opt_error.value());
     return;
   }
-  if (!security_policy_->CanReadFileSystemFile(process_id_, src_url) ||
-      !security_policy_->CanCopyIntoFileSystemFile(process_id_, dest_url)) {
+
+  content::GetUIThreadTaskRunner({})->PostTaskAndReplyWithResult(
+      FROM_HERE,
+      // security_policy_ is a singleton so refcounting is unnecessary
+      base::BindOnce(&ChildProcessSecurityPolicyImpl::CanCopyFileSystemFile,
+                     base::Unretained(security_policy_), process_id_, src_url,
+                     dest_url),
+      base::BindOnce(&FileSystemManagerImpl::ContinueCopy,
+                     weak_factory_.GetWeakPtr(), src_url, dest_url,
+                     std::move(callback)));
+}
+
+void FileSystemManagerImpl::ContinueCopy(const storage::FileSystemURL& src_url,
+                                         const storage::FileSystemURL& dest_url,
+                                         CopyCallback callback,
+                                         bool security_check_success) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  if (!security_check_success) {
     std::move(callback).Run(base::File::FILE_ERROR_SECURITY);
     return;
   }
 
-  operation_runner()->Copy(
-      src_url, dest_url, storage::FileSystemOperation::CopyOrMoveOptionSet(),
-      FileSystemOperation::ERROR_BEHAVIOR_ABORT,
-      storage::FileSystemOperation::CopyOrMoveProgressCallback(),
-      base::BindOnce(&FileSystemManagerImpl::DidFinish, GetWeakPtr(),
-                     std::move(callback)));
+  storage::FileSystemOperationRunner* fs_op_runner = operation_runner();
+  if (!fs_op_runner) {
+    /* A null FileSystemOperationRunner at this point means the corresponding
+     * renderer was terminated, so return early to ignore the requested
+     * FileSystemOperation. */
+    return;
+  }
+
+  fs_op_runner->Copy(src_url, dest_url,
+                     storage::FileSystemOperation::CopyOrMoveOptionSet(),
+                     FileSystemOperation::ERROR_BEHAVIOR_ABORT,
+                     storage::FileSystemOperation::CopyOrMoveProgressCallback(),
+                     base::BindOnce(&FileSystemManagerImpl::DidFinish,
+                                    GetWeakPtr(), std::move(callback)));
 }
 
 void FileSystemManagerImpl::Remove(const GURL& path,
@@ -324,14 +406,38 @@
     std::move(callback).Run(opt_error.value());
     return;
   }
-  if (!security_policy_->CanDeleteFileSystemFile(process_id_, url)) {
+
+  content::GetUIThreadTaskRunner({})->PostTaskAndReplyWithResult(
+      FROM_HERE,
+      // security_policy_ is a singleton so refcounting is unnecessary
+      base::BindOnce(&ChildProcessSecurityPolicyImpl::CanDeleteFileSystemFile,
+                     base::Unretained(security_policy_), process_id_, url),
+      base::BindOnce(&FileSystemManagerImpl::ContinueRemove,
+                     weak_factory_.GetWeakPtr(), url, recursive,
+                     std::move(callback)));
+}
+
+void FileSystemManagerImpl::ContinueRemove(const storage::FileSystemURL& url,
+                                           bool recursive,
+                                           RemoveCallback callback,
+                                           bool security_check_success) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  if (!security_check_success) {
     std::move(callback).Run(base::File::FILE_ERROR_SECURITY);
     return;
   }
 
-  operation_runner()->Remove(url, recursive,
-                             base::BindOnce(&FileSystemManagerImpl::DidFinish,
-                                            GetWeakPtr(), std::move(callback)));
+  storage::FileSystemOperationRunner* fs_op_runner = operation_runner();
+  if (!fs_op_runner) {
+    /* A null FileSystemOperationRunner at this point means the corresponding
+     * renderer was terminated, so return early to ignore the requested
+     * FileSystemOperation. */
+    return;
+  }
+
+  fs_op_runner->Remove(url, recursive,
+                       base::BindOnce(&FileSystemManagerImpl::DidFinish,
+                                      GetWeakPtr(), std::move(callback)));
 }
 
 void FileSystemManagerImpl::ReadMetadata(const GURL& path,
@@ -343,13 +449,37 @@
     std::move(callback).Run(base::File::Info(), opt_error.value());
     return;
   }
-  if (!security_policy_->CanReadFileSystemFile(process_id_, url)) {
+
+  content::GetUIThreadTaskRunner({})->PostTaskAndReplyWithResult(
+      FROM_HERE,
+      // security_policy_ is a singleton so refcounting is unnecessary
+      base::BindOnce(&ChildProcessSecurityPolicyImpl::CanReadFileSystemFile,
+                     base::Unretained(security_policy_), process_id_, url),
+      base::BindOnce(&FileSystemManagerImpl::ContinueReadMetadata,
+                     weak_factory_.GetWeakPtr(), url, std::move(callback)));
+}
+
+void FileSystemManagerImpl::ContinueReadMetadata(
+    const storage::FileSystemURL& url,
+    ReadMetadataCallback callback,
+    bool security_check_success) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+
+  if (!security_check_success) {
     std::move(callback).Run(base::File::Info(),
                             base::File::FILE_ERROR_SECURITY);
     return;
   }
 
-  operation_runner()->GetMetadata(
+  storage::FileSystemOperationRunner* fs_op_runner = operation_runner();
+  if (!fs_op_runner) {
+    /* A null FileSystemOperationRunner at this point means the corresponding
+     * renderer was terminated, so return early to ignore the requested
+     * FileSystemOperation. */
+    return;
+  }
+
+  fs_op_runner->GetMetadata(
       url,
       FileSystemOperation::GET_METADATA_FIELD_IS_DIRECTORY |
           FileSystemOperation::GET_METADATA_FIELD_SIZE |
@@ -370,21 +500,46 @@
     std::move(callback).Run(opt_error.value());
     return;
   }
-  if (!security_policy_->CanCreateFileSystemFile(process_id_, url)) {
+
+  content::GetUIThreadTaskRunner({})->PostTaskAndReplyWithResult(
+      FROM_HERE,
+      // security_policy_ is a singleton so refcounting is unnecessary
+      base::BindOnce(&ChildProcessSecurityPolicyImpl::CanCreateFileSystemFile,
+                     base::Unretained(security_policy_), process_id_, url),
+      base::BindOnce(&FileSystemManagerImpl::ContinueCreate,
+                     weak_factory_.GetWeakPtr(), url, exclusive, is_directory,
+                     recursive, std::move(callback)));
+}
+
+void FileSystemManagerImpl::ContinueCreate(const storage::FileSystemURL& url,
+                                           bool exclusive,
+                                           bool is_directory,
+                                           bool recursive,
+                                           CreateCallback callback,
+                                           bool security_check_success) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  if (!security_check_success) {
     std::move(callback).Run(base::File::FILE_ERROR_SECURITY);
     return;
   }
 
+  storage::FileSystemOperationRunner* fs_op_runner = operation_runner();
+  if (!fs_op_runner) {
+    /* A null FileSystemOperationRunner at this point means the corresponding
+     * renderer was terminated, so return early to ignore the requested
+     * FileSystemOperation. */
+    return;
+  }
+
   if (is_directory) {
-    operation_runner()->CreateDirectory(
+    fs_op_runner->CreateDirectory(
         url, exclusive, recursive,
         base::BindOnce(&FileSystemManagerImpl::DidFinish, GetWeakPtr(),
                        std::move(callback)));
   } else {
-    operation_runner()->CreateFile(
-        url, exclusive,
-        base::BindOnce(&FileSystemManagerImpl::DidFinish, GetWeakPtr(),
-                       std::move(callback)));
+    fs_op_runner->CreateFile(url, exclusive,
+                             base::BindOnce(&FileSystemManagerImpl::DidFinish,
+                                            GetWeakPtr(), std::move(callback)));
   }
 }
 
@@ -398,17 +553,41 @@
     std::move(callback).Run(opt_error.value());
     return;
   }
-  if (!security_policy_->CanReadFileSystemFile(process_id_, url)) {
+
+  content::GetUIThreadTaskRunner({})->PostTaskAndReplyWithResult(
+      FROM_HERE,
+      // security_policy_ is a singleton so refcounting is unnecessary
+      base::BindOnce(&ChildProcessSecurityPolicyImpl::CanReadFileSystemFile,
+                     base::Unretained(security_policy_), process_id_, url),
+      base::BindOnce(&FileSystemManagerImpl::ContinueExists,
+                     weak_factory_.GetWeakPtr(), url, is_directory,
+                     std::move(callback)));
+}
+
+void FileSystemManagerImpl::ContinueExists(const storage::FileSystemURL& url,
+                                           bool is_directory,
+                                           ExistsCallback callback,
+                                           bool security_check_success) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  if (!security_check_success) {
     std::move(callback).Run(base::File::FILE_ERROR_SECURITY);
     return;
   }
 
+  storage::FileSystemOperationRunner* fs_op_runner = operation_runner();
+  if (!fs_op_runner) {
+    /* A null FileSystemOperationRunner at this point means the corresponding
+     * renderer was terminated, so return early to ignore the requested
+     * FileSystemOperation. */
+    return;
+  }
+
   if (is_directory) {
-    operation_runner()->DirectoryExists(
+    fs_op_runner->DirectoryExists(
         url, base::BindOnce(&FileSystemManagerImpl::DidFinish, GetWeakPtr(),
                             std::move(callback)));
   } else {
-    operation_runner()->FileExists(
+    fs_op_runner->FileExists(
         url, base::BindOnce(&FileSystemManagerImpl::DidFinish, GetWeakPtr(),
                             std::move(callback)));
   }
@@ -427,13 +606,37 @@
     listener->ErrorOccurred(opt_error.value());
     return;
   }
-  if (!security_policy_->CanReadFileSystemFile(process_id_, url)) {
+
+  content::GetUIThreadTaskRunner({})->PostTaskAndReplyWithResult(
+      FROM_HERE,
+      // security_policy_ is a singleton so refcounting is unnecessary
+      base::BindOnce(&ChildProcessSecurityPolicyImpl::CanReadFileSystemFile,
+                     base::Unretained(security_policy_), process_id_, url),
+      base::BindOnce(&FileSystemManagerImpl::ContinueReadDirectory,
+                     weak_factory_.GetWeakPtr(), url, std::move(listener)));
+}
+
+void FileSystemManagerImpl::ContinueReadDirectory(
+    const storage::FileSystemURL& url,
+    mojo::Remote<blink::mojom::FileSystemOperationListener> listener,
+    bool security_check_success) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+
+  if (!security_check_success) {
     listener->ErrorOccurred(base::File::FILE_ERROR_SECURITY);
     return;
   }
 
   OperationListenerID listener_id = AddOpListener(std::move(listener));
-  operation_runner()->ReadDirectory(
+  storage::FileSystemOperationRunner* fs_op_runner = operation_runner();
+  if (!fs_op_runner) {
+    /* A null FileSystemOperationRunner at this point means the corresponding
+     * renderer was terminated, so return early to ignore the requested
+     * FileSystemOperation. */
+    return;
+  }
+
+  fs_op_runner->ReadDirectory(
       url, base::BindRepeating(&FileSystemManagerImpl::DidReadDirectory,
                                GetWeakPtr(), listener_id));
 }
@@ -449,13 +652,35 @@
                             opt_error.value());
     return;
   }
-  if (!security_policy_->CanReadFileSystemFile(process_id_, url)) {
+  content::GetUIThreadTaskRunner({})->PostTaskAndReplyWithResult(
+      FROM_HERE,
+      // security_policy_ is a singleton so refcounting is unnecessary
+      base::BindOnce(&ChildProcessSecurityPolicyImpl::CanReadFileSystemFile,
+                     base::Unretained(security_policy_), process_id_, url),
+      base::BindOnce(&FileSystemManagerImpl::ContinueReadDirectorySync,
+                     weak_factory_.GetWeakPtr(), url, std::move(callback)));
+}
+
+void FileSystemManagerImpl::ContinueReadDirectorySync(
+    const storage::FileSystemURL& url,
+    ReadDirectorySyncCallback callback,
+    bool security_check_success) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  if (!security_check_success) {
     std::move(callback).Run(std::vector<filesystem::mojom::DirectoryEntryPtr>(),
                             base::File::FILE_ERROR_SECURITY);
     return;
   }
 
-  operation_runner()->ReadDirectory(
+  storage::FileSystemOperationRunner* fs_op_runner = operation_runner();
+  if (!fs_op_runner) {
+    /* A null FileSystemOperationRunner at this point means the corresponding
+     * renderer was terminated, so return early to ignore the requested
+     * FileSystemOperation. */
+    return;
+  }
+
+  fs_op_runner->ReadDirectory(
       url, base::BindRepeating(
                &FileSystemManagerImpl::DidReadDirectorySync, GetWeakPtr(),
                base::Owned(
@@ -480,7 +705,26 @@
     listener->ErrorOccurred(opt_error.value());
     return;
   }
-  if (!security_policy_->CanWriteFileSystemFile(process_id_, url)) {
+  content::GetUIThreadTaskRunner({})->PostTaskAndReplyWithResult(
+      FROM_HERE,
+      // security_policy_ is a singleton so refcounting is unnecessary
+      base::BindOnce(&ChildProcessSecurityPolicyImpl::CanWriteFileSystemFile,
+                     base::Unretained(security_policy_), process_id_, url),
+      base::BindOnce(&FileSystemManagerImpl::ContinueWrite,
+                     weak_factory_.GetWeakPtr(), url, blob_uuid, position,
+                     std::move(op_receiver), std::move(listener)));
+}
+
+void FileSystemManagerImpl::ContinueWrite(
+    const storage::FileSystemURL& url,
+    const std::string& blob_uuid,
+    int64_t position,
+    mojo::PendingReceiver<blink::mojom::FileSystemCancellableOperation>
+        op_receiver,
+    mojo::Remote<blink::mojom::FileSystemOperationListener> listener,
+    bool security_check_success) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  if (!security_check_success) {
     listener->ErrorOccurred(base::File::FILE_ERROR_SECURITY);
     return;
   }
@@ -489,10 +733,18 @@
 
   OperationListenerID listener_id = AddOpListener(std::move(listener));
 
-  OperationID op_id = operation_runner()->Write(
-      url, std::move(blob), position,
-      base::BindRepeating(&FileSystemManagerImpl::DidWrite, GetWeakPtr(),
-                          listener_id));
+  storage::FileSystemOperationRunner* fs_op_runner = operation_runner();
+  if (!fs_op_runner) {
+    /* A null FileSystemOperationRunner at this point means the corresponding
+     * renderer was terminated, so return early to ignore the requested
+     * FileSystemOperation. */
+    return;
+  }
+
+  OperationID op_id =
+      fs_op_runner->Write(url, std::move(blob), position,
+                          base::BindRepeating(&FileSystemManagerImpl::DidWrite,
+                                              GetWeakPtr(), listener_id));
   cancellable_operations_.Add(
       std::make_unique<FileSystemCancellableOperationImpl>(op_id, this),
       std::move(op_receiver));
@@ -510,14 +762,38 @@
     std::move(callback).Run(0, opt_error.value());
     return;
   }
-  if (!security_policy_->CanWriteFileSystemFile(process_id_, url)) {
+  content::GetUIThreadTaskRunner({})->PostTaskAndReplyWithResult(
+      FROM_HERE,
+      // security_policy_ is a singleton so refcounting is unnecessary
+      base::BindOnce(&ChildProcessSecurityPolicyImpl::CanWriteFileSystemFile,
+                     base::Unretained(security_policy_), process_id_, url),
+      base::BindOnce(&FileSystemManagerImpl::ContinueWriteSync,
+                     weak_factory_.GetWeakPtr(), url, blob_uuid, position,
+                     std::move(callback)));
+}
+
+void FileSystemManagerImpl::ContinueWriteSync(const storage::FileSystemURL& url,
+                                              const std::string& blob_uuid,
+                                              int64_t position,
+                                              WriteSyncCallback callback,
+                                              bool security_check_success) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  if (!security_check_success) {
     std::move(callback).Run(0, base::File::FILE_ERROR_SECURITY);
     return;
   }
   std::unique_ptr<storage::BlobDataHandle> blob =
       blob_storage_context_->context()->GetBlobDataFromUUID(blob_uuid);
 
-  operation_runner()->Write(
+  storage::FileSystemOperationRunner* fs_op_runner = operation_runner();
+  if (!fs_op_runner) {
+    /* A null FileSystemOperationRunner at this point means the corresponding
+     * renderer was terminated, so return early to ignore the requested
+     * FileSystemOperation. */
+    return;
+  }
+
+  fs_op_runner->Write(
       url, std::move(blob), position,
       base::BindRepeating(
           &FileSystemManagerImpl::DidWriteSync, GetWeakPtr(),
@@ -538,15 +814,43 @@
     std::move(callback).Run(opt_error.value());
     return;
   }
-  if (!security_policy_->CanWriteFileSystemFile(process_id_, url)) {
+  content::GetUIThreadTaskRunner({})->PostTaskAndReplyWithResult(
+      FROM_HERE,
+      // security_policy_ is a singleton so refcounting is unnecessary
+      base::BindOnce(&ChildProcessSecurityPolicyImpl::CanWriteFileSystemFile,
+                     base::Unretained(security_policy_), process_id_, url),
+      base::BindOnce(&FileSystemManagerImpl::ContinueTruncate,
+                     weak_factory_.GetWeakPtr(), url, length,
+                     std::move(op_receiver), std::move(callback)));
+}
+
+void FileSystemManagerImpl::ContinueTruncate(
+    const storage::FileSystemURL& url,
+    int64_t length,
+    mojo::PendingReceiver<blink::mojom::FileSystemCancellableOperation>
+        op_receiver,
+    TruncateCallback callback,
+    bool security_check_success) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  if (!security_check_success) {
     std::move(callback).Run(base::File::FILE_ERROR_SECURITY);
     return;
   }
 
-  OperationID op_id = operation_runner()->Truncate(
-      url, length,
-      base::BindOnce(&FileSystemManagerImpl::DidFinish, GetWeakPtr(),
-                     std::move(callback)));
+  storage::FileSystemOperationRunner* fs_op_runner = operation_runner();
+  if (!fs_op_runner) {
+    /* A null FileSystemOperationRunner at this point means the corresponding
+     * renderer was terminated, so return early to ignore the requested
+     * FileSystemOperation. */
+    return;
+  }
+
+  // TODO(https://crbug.com/1221308): function will use StorageKey for the
+  // receiver frame/worker in future CL
+  OperationID op_id =
+      fs_op_runner->Truncate(url, length,
+                             base::BindOnce(&FileSystemManagerImpl::DidFinish,
+                                            GetWeakPtr(), std::move(callback)));
   cancellable_operations_.Add(
       std::make_unique<FileSystemCancellableOperationImpl>(op_id, this),
       std::move(op_receiver));
@@ -563,21 +867,48 @@
     std::move(callback).Run(opt_error.value());
     return;
   }
-  if (!security_policy_->CanWriteFileSystemFile(process_id_, url)) {
+
+  content::GetUIThreadTaskRunner({})->PostTaskAndReplyWithResult(
+      FROM_HERE,
+      // security_policy_ is a singleton so refcounting is unnecessary
+      base::BindOnce(&ChildProcessSecurityPolicyImpl::CanWriteFileSystemFile,
+                     base::Unretained(security_policy_), process_id_, url),
+      base::BindOnce(&FileSystemManagerImpl::ContinueTruncateSync,
+                     weak_factory_.GetWeakPtr(), url, length,
+                     std::move(callback)));
+}
+
+void FileSystemManagerImpl::ContinueTruncateSync(
+    const storage::FileSystemURL& url,
+    int64_t length,
+    TruncateSyncCallback callback,
+    bool security_check_success) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+
+  if (!security_check_success) {
     std::move(callback).Run(base::File::FILE_ERROR_SECURITY);
     return;
   }
 
-  operation_runner()->Truncate(
-      url, length,
-      base::BindOnce(&FileSystemManagerImpl::DidFinish, GetWeakPtr(),
-                     std::move(callback)));
+  storage::FileSystemOperationRunner* fs_op_runner = operation_runner();
+  if (!fs_op_runner) {
+    /* A null FileSystemOperationRunner at this point means the corresponding
+     * renderer was terminated, so return early to ignore the requested
+     * FileSystemOperation. */
+    return;
+  }
+
+  fs_op_runner->Truncate(url, length,
+                         base::BindOnce(&FileSystemManagerImpl::DidFinish,
+                                        GetWeakPtr(), std::move(callback)));
 }
 
 void FileSystemManagerImpl::CreateSnapshotFile(
     const GURL& file_path,
     CreateSnapshotFileCallback callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  // TODO(https://crbug.com/1221308): function will use StorageKey for the
+  // receiver frame/worker in future CL
   FileSystemURL url(context_->CrackURL(
       file_path, blink::StorageKey(url::Origin::Create(file_path))));
 
@@ -590,16 +921,39 @@
                             opt_error.value(), mojo::NullRemote());
     return;
   }
-  if (!security_policy_->CanReadFileSystemFile(process_id_, url)) {
+  content::GetUIThreadTaskRunner({})->PostTaskAndReplyWithResult(
+      FROM_HERE,
+      // security_policy_ is a singleton so refcounting is unnecessary
+      base::BindOnce(&ChildProcessSecurityPolicyImpl::CanReadFileSystemFile,
+                     base::Unretained(security_policy_), process_id_, url),
+      base::BindOnce(&FileSystemManagerImpl::ContinueCreateSnapshotFile,
+                     weak_factory_.GetWeakPtr(), url, std::move(callback)));
+}
+
+void FileSystemManagerImpl::ContinueCreateSnapshotFile(
+    const storage::FileSystemURL& url,
+    CreateSnapshotFileCallback callback,
+    bool security_check_success) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+
+  if (!security_check_success) {
     std::move(callback).Run(base::File::Info(), base::FilePath(),
                             base::File::FILE_ERROR_SECURITY,
                             mojo::NullRemote());
     return;
   }
 
+  storage::FileSystemOperationRunner* fs_op_runner = operation_runner();
+  if (!fs_op_runner) {
+    /* A null FileSystemOperationRunner at this point means the corresponding
+     * renderer was terminated, so return early to ignore the requested
+     * FileSystemOperation. */
+    return;
+  }
+
   FileSystemBackend* backend = context_->GetFileSystemBackend(url.type());
   if (backend->SupportsStreaming(url)) {
-    operation_runner()->GetMetadata(
+    fs_op_runner->GetMetadata(
         url,
         FileSystemOperation::GET_METADATA_FIELD_IS_DIRECTORY |
             FileSystemOperation::GET_METADATA_FIELD_SIZE |
@@ -607,7 +961,7 @@
         base::BindOnce(&FileSystemManagerImpl::DidGetMetadataForStreaming,
                        GetWeakPtr(), std::move(callback)));
   } else {
-    operation_runner()->CreateSnapshotFile(
+    fs_op_runner->CreateSnapshotFile(
         url, base::BindOnce(&FileSystemManagerImpl::DidCreateSnapshot,
                             GetWeakPtr(), std::move(callback), url));
   }
@@ -785,9 +1139,28 @@
     return;
   }
 
+  content::GetUIThreadTaskRunner({})->PostTaskAndReplyWithResult(
+      FROM_HERE,
+      // security_policy_ is a singleton so refcounting is unnecessary
+      base::BindOnce(&ChildProcessSecurityPolicyImpl::CanReadFile,
+                     base::Unretained(security_policy_), process_id_,
+                     platform_path),
+      base::BindOnce(&FileSystemManagerImpl::ContinueDidCreateSnapshot,
+                     weak_factory_.GetWeakPtr(), std::move(callback), url,
+                     result, info, platform_path));
+}
+
+void FileSystemManagerImpl::ContinueDidCreateSnapshot(
+    CreateSnapshotFileCallback callback,
+    const storage::FileSystemURL& url,
+    base::File::Error result,
+    const base::File::Info& info,
+    const base::FilePath& platform_path,
+    bool security_check_success) {
   scoped_refptr<storage::ShareableFileReference> file_ref =
       storage::ShareableFileReference::Get(platform_path);
-  if (!security_policy_->CanReadFile(process_id_, platform_path)) {
+
+  if (!security_check_success) {
     // Give per-file read permission to the snapshot file if it hasn't it yet.
     // In order for the renderer to be able to read the file via File object,
     // it must be granted per-file read permission for the file's platform

content/browser/file_system/file_system_manager_impl.h

diff --git a/content/browser/file_system/file_system_manager_impl.h b/content/browser/file_system/file_system_manager_impl.h
index 0b2d7c4a..e12139e 100644
--- a/content/browser/file_system/file_system_manager_impl.h
+++ b/content/browser/file_system/file_system_manager_impl.h
@@ -26,6 +26,7 @@
 #include "mojo/public/cpp/bindings/unique_receiver_set.h"
 #include "storage/browser/file_system/file_system_context.h"
 #include "storage/browser/file_system/file_system_operation_runner.h"
+#include "storage/browser/file_system/file_system_url.h"
 #include "storage/common/file_system/file_system_types.h"
 #include "third_party/blink/public/common/storage_key/storage_key.h"
 #include "third_party/blink/public/mojom/filesystem/file_system.mojom.h"
@@ -135,6 +136,74 @@
   struct WriteSyncCallbackEntry;
   struct ReadDirectorySyncCallbackEntry;
 
+  void ContinueOpen(const url::Origin& origin,
+                    blink::mojom::FileSystemType file_system_type,
+                    mojo::ReportBadMessageCallback bad_message_callback,
+                    OpenCallback callback,
+                    const blink::StorageKey& storage_key,
+                    bool security_check_success);
+  void ContinueResolveURL(const storage::FileSystemURL& url,
+                          ResolveURLCallback callback,
+                          bool security_check_success);
+  void ContinueMove(const storage::FileSystemURL& src_url,
+                    const storage::FileSystemURL& dest_url,
+                    MoveCallback callback,
+                    bool security_check_success);
+  void ContinueCopy(const storage::FileSystemURL& src_url,
+                    const storage::FileSystemURL& dest_url,
+                    CopyCallback callback,
+                    bool security_check_success);
+  void ContinueRemove(const storage::FileSystemURL& url,
+                      bool recursive,
+                      RemoveCallback callback,
+                      bool security_check_success);
+  void ContinueReadMetadata(const storage::FileSystemURL& url,
+                            ReadMetadataCallback callback,
+                            bool security_check_success);
+  void ContinueCreate(const storage::FileSystemURL& url,
+                      bool exclusive,
+                      bool is_directory,
+                      bool recursive,
+                      CreateCallback callback,
+                      bool security_check_success);
+  void ContinueExists(const storage::FileSystemURL& url,
+                      bool is_directory,
+                      ExistsCallback callback,
+                      bool security_check_success);
+  void ContinueReadDirectory(
+      const storage::FileSystemURL& url,
+      mojo::Remote<blink::mojom::FileSystemOperationListener> listener,
+      bool security_check_success);
+  void ContinueReadDirectorySync(const storage::FileSystemURL& url,
+                                 ReadDirectorySyncCallback callback,
+                                 bool security_check_success);
+  void ContinueWrite(
+      const storage::FileSystemURL& url,
+      const std::string& blob_uuid,
+      int64_t position,
+      mojo::PendingReceiver<blink::mojom::FileSystemCancellableOperation>
+          op_receiver,
+      mojo::Remote<blink::mojom::FileSystemOperationListener> listener,
+      bool security_check_success);
+  void ContinueWriteSync(const storage::FileSystemURL& url,
+                         const std::string& blob_uuid,
+                         int64_t position,
+                         WriteSyncCallback callback,
+                         bool security_check_success);
+  void ContinueTruncate(
+      const storage::FileSystemURL& url,
+      int64_t length,
+      mojo::PendingReceiver<blink::mojom::FileSystemCancellableOperation>
+          op_receiver,
+      TruncateCallback callback,
+      bool security_check_success);
+  void ContinueTruncateSync(const storage::FileSystemURL& url,
+                            int64_t length,
+                            TruncateSyncCallback callback,
+                            bool security_check_success);
+  void ContinueCreateSnapshotFile(const storage::FileSystemURL& url,
+                                  CreateSnapshotFileCallback callback,
+                                  bool security_check_success);
   void Cancel(
       OperationID op_id,
       blink::mojom::FileSystemCancellableOperation::CancelCallback callback);
@@ -183,10 +252,15 @@
       const base::File::Info& info,
       const base::FilePath& platform_path,
       scoped_refptr<storage::ShareableFileReference> file_ref);
+  void ContinueDidCreateSnapshot(CreateSnapshotFileCallback callback,
+                                 const storage::FileSystemURL& url,
+                                 base::File::Error result,
+                                 const base::File::Info& info,
+                                 const base::FilePath& platform_path,
+                                 bool security_check_success);
   void DidGetPlatformPath(scoped_refptr<storage::FileSystemContext> context,
                           GetPlatformPathCallback callback,
                           base::FilePath platform_path);
-
   static void GetPlatformPathOnFileThread(
       const GURL& path,
       int process_id,

content/browser/portal/portal.cc

diff --git a/content/browser/portal/portal.cc b/content/browser/portal/portal.cc
index 70433f3..1f1fc03 100644
--- a/content/browser/portal/portal.cc
+++ b/content/browser/portal/portal.cc
@@ -261,7 +261,7 @@
   const blink::LocalFrameToken frame_token =
       owner_render_frame_host_->GetFrameToken();
   portal_root->navigator().NavigateFromFrameProxy(
-      portal_frame, url, &frame_token,
+      portal_frame, out_validated_url, &frame_token,
       owner_render_frame_host_->GetProcess()->GetID(),
       owner_render_frame_host_->GetLastCommittedOrigin(),
       owner_render_frame_host_->GetSiteInstance(),

content/browser/renderer_host/render_frame_host_impl.cc

diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
index 70ba840..31a484e 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -6899,6 +6899,13 @@
     mojo::PendingAssociatedReceiver<blink::mojom::FencedFrameOwnerHost>
         pending_receiver,
     CreateFencedFrameCallback callback) {
+  // TODO(btiszka): Add blink::features::IsFencedFramesEnabled() check
+  // after kFencedFrames has been switched to FEATURE_DISABLED_BY_DEFAULT
+  if (!blink::features::IsFencedFramesMPArchBased()) {
+    bad_message::ReceivedBadMessage(
+        GetProcess(), bad_message::RFH_FENCED_FRAME_MOJO_WHEN_DISABLED);
+    return;
+  }
   fenced_frames_.push_back(
       std::make_unique<FencedFrame>(weak_ptr_factory_.GetSafeRef()));
   FencedFrame* fenced_frame = fenced_frames_.back().get();

content/browser/security_exploit_browsertest.cc

diff --git a/content/browser/security_exploit_browsertest.cc b/content/browser/security_exploit_browsertest.cc
index b01bc217..a533221 100644
--- a/content/browser/security_exploit_browsertest.cc
+++ b/content/browser/security_exploit_browsertest.cc
@@ -1854,4 +1854,29 @@
               Optional(HasSubstr("Trust Token params in fenced frame nav")));
 }
 
+// Ensure that we kill the renderer process if we try to create a
+// fenced-frame when the blink::features::kFencedFrames/mparch
+// feature is not enabled.
+IN_PROC_BROWSER_TEST_F(SecurityExploitBrowserTest,
+                       CreateFencedFrameWhenFeatureDisabled) {
+  GURL foo("http://foo.com/simple_page.html");
+  EXPECT_TRUE(NavigateToURL(shell(), foo));
+  EXPECT_EQ(u"OK", shell()->web_contents()->GetTitle());
+  EXPECT_FALSE(blink::features::IsFencedFramesMPArchBased());
+
+  RenderFrameHostImpl* compromised_rfh = static_cast<RenderFrameHostImpl*>(
+      shell()->web_contents()->GetMainFrame());
+
+  mojo::PendingAssociatedRemote<blink::mojom::FencedFrameOwnerHost> remote;
+  mojo::PendingAssociatedReceiver<blink::mojom::FencedFrameOwnerHost> receiver;
+  receiver = remote.InitWithNewEndpointAndPassReceiver();
+
+  RenderProcessHostBadIpcMessageWaiter kill_waiter(
+      compromised_rfh->GetProcess());
+  static_cast<mojom::FrameHost*>(compromised_rfh)
+      ->CreateFencedFrame(std::move(receiver), base::NullCallback());
+  EXPECT_EQ(bad_message::RFH_FENCED_FRAME_MOJO_WHEN_DISABLED,
+            kill_waiter.Wait());
+}
+
 }  // namespace content

content/browser/shared_storage/shared_storage_browsertest.cc

diff --git a/content/browser/shared_storage/shared_storage_browsertest.cc b/content/browser/shared_storage/shared_storage_browsertest.cc
index 7f3e8c6..374dc0c 100644
--- a/content/browser/shared_storage/shared_storage_browsertest.cc
+++ b/content/browser/shared_storage/shared_storage_browsertest.cc
@@ -36,7 +36,12 @@
 
 class TestSharedStorageWorkletHost : public SharedStorageWorkletHost {
  public:
-  using SharedStorageWorkletHost::SharedStorageWorkletHost;
+  TestSharedStorageWorkletHost(
+      std::unique_ptr<SharedStorageWorkletDriver> driver,
+      SharedStorageDocumentServiceImpl& document_service,
+      bool should_defer_worklet_messages)
+      : SharedStorageWorkletHost(std::move(driver), document_service),
+        should_defer_worklet_messages_(should_defer_worklet_messages) {}
 
   ~TestSharedStorageWorkletHost() override = default;
 
@@ -48,23 +53,93 @@
     worklet_responses_count_waiter_.Run();
   }
 
+  void set_should_defer_worklet_messages(bool should_defer_worklet_messages) {
+    should_defer_worklet_messages_ = should_defer_worklet_messages;
+  }
+
+  const std::vector<base::OnceClosure>& pending_worklet_messages() {
+    return pending_worklet_messages_;
+  }
+
+  void ConsoleLog(const std::string& message) override {
+    ConsoleLogHelper(message, /*initial_message=*/true);
+  }
+
+  void ConsoleLogHelper(const std::string& message, bool initial_message) {
+    if (should_defer_worklet_messages_ && initial_message) {
+      pending_worklet_messages_.push_back(base::BindOnce(
+          &TestSharedStorageWorkletHost::ConsoleLogHelper,
+          weak_ptr_factory_.GetWeakPtr(), message, /*initial_message=*/false));
+      return;
+    }
+
+    SharedStorageWorkletHost::ConsoleLog(message);
+  }
+
+  void FireKeepAliveTimerNow() {
+    ASSERT_TRUE(GetKeepAliveTimerForTesting().IsRunning());
+    GetKeepAliveTimerForTesting().FireNow();
+  }
+
+  void ExecutePendingWorkletMessages() {
+    for (auto& callback : pending_worklet_messages_) {
+      std::move(callback).Run();
+    }
+  }
+
  private:
   void OnAddModuleOnWorkletFinished(
       blink::mojom::SharedStorageDocumentService::AddModuleOnWorkletCallback
           callback,
       bool success,
       const std::string& error_message) override {
-    SharedStorageWorkletHost::OnAddModuleOnWorkletFinished(
-        std::move(callback), success, error_message);
-    OnWorkletResponseReceived();
+    OnAddModuleOnWorkletFinishedHelper(std::move(callback), success,
+                                       error_message,
+                                       /*initial_message=*/true);
+  }
+
+  void OnAddModuleOnWorkletFinishedHelper(
+      blink::mojom::SharedStorageDocumentService::AddModuleOnWorkletCallback
+          callback,
+      bool success,
+      const std::string& error_message,
+      bool initial_message) {
+    if (should_defer_worklet_messages_ && initial_message) {
+      pending_worklet_messages_.push_back(base::BindOnce(
+          &TestSharedStorageWorkletHost::OnAddModuleOnWorkletFinishedHelper,
+          weak_ptr_factory_.GetWeakPtr(), std::move(callback), success,
+          error_message, /*initial_message=*/false));
+    } else {
+      SharedStorageWorkletHost::OnAddModuleOnWorkletFinished(
+          std::move(callback), success, error_message);
+    }
+
+    if (initial_message)
+      OnWorkletResponseReceived();
   }
 
   void OnRunOperationOnWorkletFinished(
       bool success,
       const std::string& error_message) override {
-    SharedStorageWorkletHost::OnRunOperationOnWorkletFinished(success,
-                                                              error_message);
-    OnWorkletResponseReceived();
+    OnRunOperationOnWorkletFinishedHelper(success, error_message,
+                                          /*initial_message=*/true);
+  }
+
+  void OnRunOperationOnWorkletFinishedHelper(bool success,
+                                             const std::string& error_message,
+                                             bool initial_message) {
+    if (should_defer_worklet_messages_ && initial_message) {
+      pending_worklet_messages_.push_back(base::BindOnce(
+          &TestSharedStorageWorkletHost::OnRunOperationOnWorkletFinishedHelper,
+          weak_ptr_factory_.GetWeakPtr(), success, error_message,
+          /*initial_message=*/false));
+    } else {
+      SharedStorageWorkletHost::OnRunOperationOnWorkletFinished(success,
+                                                                error_message);
+    }
+
+    if (initial_message)
+      OnWorkletResponseReceived();
   }
 
   void OnWorkletResponseReceived() {
@@ -76,11 +151,26 @@
     }
   }
 
+  base::TimeDelta GetKeepAliveTimeout() const override {
+    // Configure a timeout large enough so that the scheduled task won't run
+    // automatically. Instead, we will manually call OneShotTimer::FireNow().
+    return base::Seconds(30);
+  }
+
   // How many worklet operations have finished. This only include addModule and
   // runOperation.
   size_t worklet_responses_count_ = 0;
   size_t expected_worklet_responses_count_ = 0;
   base::RunLoop worklet_responses_count_waiter_;
+
+  // Whether we should defer messages received from the worklet environment to
+  // handle them later. This includes request callbacks (e.g. for addModule()
+  // and runOperation()), as well as commands initiated from the worklet
+  // (e.g. console.log()).
+  bool should_defer_worklet_messages_;
+  std::vector<base::OnceClosure> pending_worklet_messages_;
+
+  base::WeakPtrFactory<TestSharedStorageWorkletHost> weak_ptr_factory_{this};
 };
 
 class TestSharedStorageWorkletHostManager
@@ -92,27 +182,40 @@
 
   std::unique_ptr<SharedStorageWorkletHost> CreateSharedStorageWorkletHost(
       std::unique_ptr<SharedStorageWorkletDriver> driver,
-      RenderFrameHost& render_frame_host) override {
-    // Use the default handling for unrelated worklet hosts
-    if (render_frame_host.GetLastCommittedURL().path() != kSimplePagePath &&
-        render_frame_host.GetLastCommittedURL().path() !=
-            kPageWithBlankIframePath) {
-      return SharedStorageWorkletHostManager::CreateSharedStorageWorkletHost(
-          std::move(driver), render_frame_host);
-    }
-
-    return std::make_unique<TestSharedStorageWorkletHost>(std::move(driver),
-                                                          render_frame_host);
+      SharedStorageDocumentServiceImpl& document_service) override {
+    return std::make_unique<TestSharedStorageWorkletHost>(
+        std::move(driver), document_service, should_defer_worklet_messages_);
   }
 
   // Precondition: there's only one eligible worklet host.
-  TestSharedStorageWorkletHost* GetWorkletHost() {
-    DCHECK_EQ(1u, GetWorkletHostsCount());
+  TestSharedStorageWorkletHost* GetAttachedWorkletHost() {
+    DCHECK_EQ(1u, GetAttachedWorkletHostsCount());
     return static_cast<TestSharedStorageWorkletHost*>(
-        GetWorkletHostsForTesting().begin()->second.get());
+        GetAttachedWorkletHostsForTesting().begin()->second.get());
   }
 
-  size_t GetWorkletHostsCount() { return GetWorkletHostsForTesting().size(); }
+  // Precondition: there's only one eligible worklet host.
+  TestSharedStorageWorkletHost* GetKeepAliveWorkletHost() {
+    DCHECK_EQ(1u, GetKeepAliveWorkletHostsCount());
+    return static_cast<TestSharedStorageWorkletHost*>(
+        GetKeepAliveWorkletHostsForTesting().begin()->second.get());
+  }
+
+  void ConfigureShouldDeferWorkletMessagesOnWorkletHostCreation(
+      bool should_defer_worklet_messages) {
+    should_defer_worklet_messages_ = should_defer_worklet_messages;
+  }
+
+  size_t GetAttachedWorkletHostsCount() {
+    return GetAttachedWorkletHostsForTesting().size();
+  }
+
+  size_t GetKeepAliveWorkletHostsCount() {
+    return GetKeepAliveWorkletHostsForTesting().size();
+  }
+
+ private:
+  bool should_defer_worklet_messages_ = false;
 };
 
 class SharedStorageBrowserTest : public ContentBrowserTest {
@@ -165,7 +268,8 @@
       sharedStorage.worklet.addModule('shared_storage/simple_module.js');
     )"));
 
-  EXPECT_EQ(1u, test_worklet_host_manager().GetWorkletHostsCount());
+  EXPECT_EQ(1u, test_worklet_host_manager().GetAttachedWorkletHostsCount());
+  EXPECT_EQ(0u, test_worklet_host_manager().GetKeepAliveWorkletHostsCount());
   EXPECT_EQ(2u, console_observer.messages().size());
   EXPECT_EQ("Start executing simple_module.js",
             base::UTF16ToUTF8(console_observer.messages()[0].message));
@@ -192,7 +296,8 @@
 
   EXPECT_EQ(expected_error, result.error);
 
-  EXPECT_EQ(1u, test_worklet_host_manager().GetWorkletHostsCount());
+  EXPECT_EQ(1u, test_worklet_host_manager().GetAttachedWorkletHostsCount());
+  EXPECT_EQ(0u, test_worklet_host_manager().GetKeepAliveWorkletHostsCount());
   EXPECT_EQ(0u, console_observer.messages().size());
 }
 
@@ -216,7 +321,8 @@
 
   EXPECT_EQ(expected_error, result.error);
 
-  EXPECT_EQ(1u, test_worklet_host_manager().GetWorkletHostsCount());
+  EXPECT_EQ(1u, test_worklet_host_manager().GetAttachedWorkletHostsCount());
+  EXPECT_EQ(0u, test_worklet_host_manager().GetKeepAliveWorkletHostsCount());
   EXPECT_EQ(0u, console_observer.messages().size());
 }
 
@@ -240,7 +346,8 @@
 
   EXPECT_EQ(expected_error, result.error);
 
-  EXPECT_EQ(1u, test_worklet_host_manager().GetWorkletHostsCount());
+  EXPECT_EQ(1u, test_worklet_host_manager().GetAttachedWorkletHostsCount());
+  EXPECT_EQ(0u, test_worklet_host_manager().GetKeepAliveWorkletHostsCount());
   EXPECT_EQ(1u, console_observer.messages().size());
   EXPECT_EQ("Start executing erroneous_module.js",
             base::UTF16ToUTF8(console_observer.messages()[0].message));
@@ -266,7 +373,8 @@
     )");
   EXPECT_EQ(expected_error, result.error);
 
-  EXPECT_EQ(1u, test_worklet_host_manager().GetWorkletHostsCount());
+  EXPECT_EQ(1u, test_worklet_host_manager().GetAttachedWorkletHostsCount());
+  EXPECT_EQ(0u, test_worklet_host_manager().GetKeepAliveWorkletHostsCount());
   EXPECT_EQ(2u, console_observer.messages().size());
   EXPECT_EQ("Start executing simple_module.js",
             base::UTF16ToUTF8(console_observer.messages()[0].message));
@@ -284,7 +392,8 @@
       sharedStorage.worklet.addModule('shared_storage/simple_module.js');
     )"));
 
-  EXPECT_EQ(1u, test_worklet_host_manager().GetWorkletHostsCount());
+  EXPECT_EQ(1u, test_worklet_host_manager().GetAttachedWorkletHostsCount());
+  EXPECT_EQ(0u, test_worklet_host_manager().GetKeepAliveWorkletHostsCount());
   EXPECT_EQ(2u, console_observer.messages().size());
   EXPECT_EQ("Start executing simple_module.js",
             base::UTF16ToUTF8(console_observer.messages()[0].message));
@@ -297,7 +406,9 @@
     )"));
 
   // There are 2 "worklet operations": addModule and runOperation.
-  test_worklet_host_manager().GetWorkletHost()->WaitForWorkletResponsesCount(2);
+  test_worklet_host_manager()
+      .GetAttachedWorkletHost()
+      ->WaitForWorkletResponsesCount(2);
 
   EXPECT_EQ(5u, console_observer.messages().size());
   EXPECT_EQ("Start executing 'test-operation'",
@@ -324,10 +435,13 @@
       sharedStorage.worklet.addModule('shared_storage/simple_module.js');
     )"));
 
-  EXPECT_EQ(1u, test_worklet_host_manager().GetWorkletHostsCount());
+  EXPECT_EQ(1u, test_worklet_host_manager().GetAttachedWorkletHostsCount());
+  EXPECT_EQ(0u, test_worklet_host_manager().GetKeepAliveWorkletHostsCount());
 
   // There are 2 "worklet operations": runOperation and addModule.
-  test_worklet_host_manager().GetWorkletHost()->WaitForWorkletResponsesCount(2);
+  test_worklet_host_manager()
+      .GetAttachedWorkletHost()
+      ->WaitForWorkletResponsesCount(2);
 
   EXPECT_EQ(3u, console_observer.messages().size());
   EXPECT_EQ(
@@ -380,7 +494,8 @@
           'shared_storage/erroneous_function_module.js');
     )"));
 
-  EXPECT_EQ(1u, test_worklet_host_manager().GetWorkletHostsCount());
+  EXPECT_EQ(1u, test_worklet_host_manager().GetAttachedWorkletHostsCount());
+  EXPECT_EQ(0u, test_worklet_host_manager().GetKeepAliveWorkletHostsCount());
   EXPECT_EQ(2u, console_observer.messages().size());
   EXPECT_EQ("Start executing erroneous_function_module.js",
             base::UTF16ToUTF8(console_observer.messages()[0].message));
@@ -397,7 +512,9 @@
     )"));
 
   // There are 2 "worklet operations": addModule and runOperation.
-  test_worklet_host_manager().GetWorkletHost()->WaitForWorkletResponsesCount(2);
+  test_worklet_host_manager()
+      .GetAttachedWorkletHost()
+      ->WaitForWorkletResponsesCount(2);
 
   EXPECT_EQ(4u, console_observer.messages().size());
   EXPECT_EQ("Start executing 'test-operation'",
@@ -422,7 +539,8 @@
           'shared_storage/shared_storage_keys_function_module.js');
     )"));
 
-  EXPECT_EQ(1u, test_worklet_host_manager().GetWorkletHostsCount());
+  EXPECT_EQ(1u, test_worklet_host_manager().GetAttachedWorkletHostsCount());
+  EXPECT_EQ(0u, test_worklet_host_manager().GetKeepAliveWorkletHostsCount());
   EXPECT_EQ(2u, console_observer.messages().size());
   EXPECT_EQ("Start executing shared_storage_keys_function_module.js",
             base::UTF16ToUTF8(console_observer.messages()[0].message));
@@ -434,7 +552,9 @@
     )"));
 
   // There are 2 "worklet operations": addModule and runOperation.
-  test_worklet_host_manager().GetWorkletHost()->WaitForWorkletResponsesCount(2);
+  test_worklet_host_manager()
+      .GetAttachedWorkletHost()
+      ->WaitForWorkletResponsesCount(2);
 
   EXPECT_EQ(4u, console_observer.messages().size());
   EXPECT_EQ("Start executing 'test-operation'",
@@ -461,11 +581,13 @@
       sharedStorage.worklet.addModule('shared_storage/simple_module.js');
     )"));
 
-  EXPECT_EQ(1u, test_worklet_host_manager().GetWorkletHostsCount());
+  EXPECT_EQ(1u, test_worklet_host_manager().GetAttachedWorkletHostsCount());
+  EXPECT_EQ(0u, test_worklet_host_manager().GetKeepAliveWorkletHostsCount());
 
   EXPECT_TRUE(NavigateToURL(shell(), GURL(url::kAboutBlankURL)));
 
-  EXPECT_EQ(0u, test_worklet_host_manager().GetWorkletHostsCount());
+  EXPECT_EQ(0u, test_worklet_host_manager().GetAttachedWorkletHostsCount());
+  EXPECT_EQ(0u, test_worklet_host_manager().GetKeepAliveWorkletHostsCount());
 }
 
 IN_PROC_BROWSER_TEST_F(SharedStorageBrowserTest, TwoWorklets) {
@@ -491,18 +613,21 @@
       sharedStorage.worklet.addModule('shared_storage/simple_module2.js');
     )"));
 
-  EXPECT_EQ(1u, test_worklet_host_manager().GetWorkletHostsCount());
+  EXPECT_EQ(1u, test_worklet_host_manager().GetAttachedWorkletHostsCount());
+  EXPECT_EQ(0u, test_worklet_host_manager().GetKeepAliveWorkletHostsCount());
 
   EXPECT_EQ(nullptr, EvalJs(shell(), R"(
       sharedStorage.worklet.addModule('shared_storage/simple_module.js');
     )"));
 
-  EXPECT_EQ(2u, test_worklet_host_manager().GetWorkletHostsCount());
+  EXPECT_EQ(2u, test_worklet_host_manager().GetAttachedWorkletHostsCount());
+  EXPECT_EQ(0u, test_worklet_host_manager().GetKeepAliveWorkletHostsCount());
 
   NavigateIframeToURL(shell()->web_contents(), "test_iframe",
                       GURL(url::kAboutBlankURL));
 
-  EXPECT_EQ(1u, test_worklet_host_manager().GetWorkletHostsCount());
+  EXPECT_EQ(1u, test_worklet_host_manager().GetAttachedWorkletHostsCount());
+  EXPECT_EQ(0u, test_worklet_host_manager().GetKeepAliveWorkletHostsCount());
 
   EXPECT_EQ(3u, console_observer.messages().size());
   EXPECT_EQ("Executing simple_module2.js",
@@ -513,4 +638,266 @@
             base::UTF16ToUTF8(console_observer.messages()[2].message));
 }
 
+IN_PROC_BROWSER_TEST_F(
+    SharedStorageBrowserTest,
+    KeepAlive_StartBeforeAddModuleComplete_EndAfterAddModuleComplete) {
+  // The test assumes pages get deleted after navigation. To ensure this,
+  // disable back/forward cache.
+  content::DisableBackForwardCacheForTesting(
+      shell()->web_contents(),
+      content::BackForwardCache::TEST_ASSUMES_NO_CACHING);
+
+  EXPECT_TRUE(NavigateToURL(
+      shell(), embedded_test_server()->GetURL("a.com", kSimplePagePath)));
+
+  test_worklet_host_manager()
+      .ConfigureShouldDeferWorkletMessagesOnWorkletHostCreation(true);
+
+  WebContentsConsoleObserver console_observer(shell()->web_contents());
+  EvalJsResult result = EvalJs(shell(), R"(
+      sharedStorage.worklet.addModule('shared_storage/simple_module.js');
+    )",
+                               EXECUTE_SCRIPT_NO_RESOLVE_PROMISES);
+
+  // Navigate to trigger keep-alive
+  EXPECT_TRUE(NavigateToURL(shell(), GURL(url::kAboutBlankURL)));
+
+  EXPECT_EQ(0u, test_worklet_host_manager().GetAttachedWorkletHostsCount());
+  EXPECT_EQ(1u, test_worklet_host_manager().GetKeepAliveWorkletHostsCount());
+
+  test_worklet_host_manager()
+      .GetKeepAliveWorkletHost()
+      ->WaitForWorkletResponsesCount(1);
+
+  // Three pending messages are expected: two for console.log and one for
+  // addModule response.
+  EXPECT_EQ(3u, test_worklet_host_manager()
+                    .GetKeepAliveWorkletHost()
+                    ->pending_worklet_messages()
+                    .size());
+
+  // Execute all the deferred messages. This will terminate the keep-alive.
+  test_worklet_host_manager()
+      .GetKeepAliveWorkletHost()
+      ->ExecutePendingWorkletMessages();
+
+  EXPECT_EQ(0u, test_worklet_host_manager().GetAttachedWorkletHostsCount());
+  EXPECT_EQ(0u, test_worklet_host_manager().GetKeepAliveWorkletHostsCount());
+
+  // Expect no console logging, as messages logged during keep-alive are
+  // dropped.
+  EXPECT_EQ(0u, console_observer.messages().size());
+}
+
+IN_PROC_BROWSER_TEST_F(SharedStorageBrowserTest,
+                       KeepAlive_StartBeforeAddModuleComplete_EndAfterTimeout) {
+  // The test assumes pages get deleted after navigation. To ensure this,
+  // disable back/forward cache.
+  content::DisableBackForwardCacheForTesting(
+      shell()->web_contents(),
+      content::BackForwardCache::TEST_ASSUMES_NO_CACHING);
+
+  EXPECT_TRUE(NavigateToURL(
+      shell(), embedded_test_server()->GetURL("a.com", kSimplePagePath)));
+
+  test_worklet_host_manager()
+      .ConfigureShouldDeferWorkletMessagesOnWorkletHostCreation(true);
+
+  WebContentsConsoleObserver console_observer(shell()->web_contents());
+  EvalJsResult result = EvalJs(shell(), R"(
+      sharedStorage.worklet.addModule('shared_storage/simple_module.js');
+    )",
+                               EXECUTE_SCRIPT_NO_RESOLVE_PROMISES);
+
+  // Navigate to trigger keep-alive
+  EXPECT_TRUE(NavigateToURL(shell(), GURL(url::kAboutBlankURL)));
+
+  EXPECT_EQ(0u, test_worklet_host_manager().GetAttachedWorkletHostsCount());
+  EXPECT_EQ(1u, test_worklet_host_manager().GetKeepAliveWorkletHostsCount());
+
+  test_worklet_host_manager()
+      .GetKeepAliveWorkletHost()
+      ->WaitForWorkletResponsesCount(1);
+
+  // Three pending messages are expected: two for console.log and one for
+  // addModule response.
+  EXPECT_EQ(3u, test_worklet_host_manager()
+                    .GetKeepAliveWorkletHost()
+                    ->pending_worklet_messages()
+                    .size());
+
+  // Fire the keep-alive timer. This will terminate the keep-alive.
+  test_worklet_host_manager()
+      .GetKeepAliveWorkletHost()
+      ->FireKeepAliveTimerNow();
+
+  EXPECT_EQ(0u, test_worklet_host_manager().GetAttachedWorkletHostsCount());
+  EXPECT_EQ(0u, test_worklet_host_manager().GetKeepAliveWorkletHostsCount());
+}
+
+IN_PROC_BROWSER_TEST_F(
+    SharedStorageBrowserTest,
+    KeepAlive_StartBeforeRunOperationComplete_EndAfterRunOperationComplete) {
+  // The test assumes pages get deleted after navigation. To ensure this,
+  // disable back/forward cache.
+  content::DisableBackForwardCacheForTesting(
+      shell()->web_contents(),
+      content::BackForwardCache::TEST_ASSUMES_NO_CACHING);
+
+  EXPECT_TRUE(NavigateToURL(
+      shell(), embedded_test_server()->GetURL("a.com", kSimplePagePath)));
+
+  WebContentsConsoleObserver console_observer(shell()->web_contents());
+  EXPECT_EQ(nullptr, EvalJs(shell(), R"(
+      sharedStorage.worklet.addModule('shared_storage/simple_module.js');
+    )"));
+
+  EXPECT_EQ(2u, console_observer.messages().size());
+
+  // Configure the worklet host to defer processing the subsequent runOperation
+  // response.
+  test_worklet_host_manager()
+      .GetAttachedWorkletHost()
+      ->set_should_defer_worklet_messages(true);
+
+  EXPECT_EQ(nullptr, EvalJs(shell(), R"(
+      sharedStorage.runOperation(
+          'test-operation', {data: {'customKey': 'customValue'}})
+    )"));
+
+  // Navigate to trigger keep-alive
+  EXPECT_TRUE(NavigateToURL(shell(), GURL(url::kAboutBlankURL)));
+
+  EXPECT_EQ(0u, test_worklet_host_manager().GetAttachedWorkletHostsCount());
+  EXPECT_EQ(1u, test_worklet_host_manager().GetKeepAliveWorkletHostsCount());
+
+  test_worklet_host_manager()
+      .GetKeepAliveWorkletHost()
+      ->WaitForWorkletResponsesCount(2);
+
+  // Four pending messages are expected: three for console.log and one for
+  // runOperation response.
+  EXPECT_EQ(4u, test_worklet_host_manager()
+                    .GetKeepAliveWorkletHost()
+                    ->pending_worklet_messages()
+                    .size());
+
+  // Execute all the deferred messages. This will terminate the keep-alive.
+  test_worklet_host_manager()
+      .GetKeepAliveWorkletHost()
+      ->ExecutePendingWorkletMessages();
+
+  EXPECT_EQ(0u, test_worklet_host_manager().GetAttachedWorkletHostsCount());
+  EXPECT_EQ(0u, test_worklet_host_manager().GetKeepAliveWorkletHostsCount());
+
+  // Expect no more console logging, as messages logged during keep-alive was
+  // dropped.
+  EXPECT_EQ(2u, console_observer.messages().size());
+}
+
+IN_PROC_BROWSER_TEST_F(SharedStorageBrowserTest, KeepAlive_SubframeWorklet) {
+  // The test assumes pages get deleted after navigation. To ensure this,
+  // disable back/forward cache.
+  content::DisableBackForwardCacheForTesting(
+      shell()->web_contents(),
+      content::BackForwardCache::TEST_ASSUMES_NO_CACHING);
+
+  EXPECT_TRUE(NavigateToURL(shell(), embedded_test_server()->GetURL(
+                                         "a.com", kPageWithBlankIframePath)));
+
+  WebContentsConsoleObserver console_observer(shell()->web_contents());
+
+  // Configure the worklet host for the subframe to defer worklet responses.
+  test_worklet_host_manager()
+      .ConfigureShouldDeferWorkletMessagesOnWorkletHostCreation(true);
+
+  RenderFrameHost* iframe =
+      static_cast<WebContentsImpl*>(shell()->web_contents())
+          ->GetPrimaryFrameTree()
+          .root()
+          ->child_at(0)
+          ->current_frame_host();
+
+  EvalJsResult result = EvalJs(iframe, R"(
+      sharedStorage.worklet.addModule('shared_storage/simple_module.js');
+    )",
+                               EXECUTE_SCRIPT_NO_RESOLVE_PROMISES);
+
+  // Navigate away to let the subframe's worklet enter keep-alive.
+  NavigateIframeToURL(shell()->web_contents(), "test_iframe",
+                      GURL(url::kAboutBlankURL));
+
+  EXPECT_EQ(0u, test_worklet_host_manager().GetAttachedWorkletHostsCount());
+  EXPECT_EQ(1u, test_worklet_host_manager().GetKeepAliveWorkletHostsCount());
+
+  // Ensure that the response is deferred.
+  test_worklet_host_manager()
+      .GetKeepAliveWorkletHost()
+      ->WaitForWorkletResponsesCount(1);
+
+  // Three pending messages are expected: two for console.log and one for
+  // addModule response.
+  EXPECT_EQ(3u, test_worklet_host_manager()
+                    .GetKeepAliveWorkletHost()
+                    ->pending_worklet_messages()
+                    .size());
+
+  // Configure the worklet host for the main frame to handle worklet responses
+  // directly.
+  test_worklet_host_manager()
+      .ConfigureShouldDeferWorkletMessagesOnWorkletHostCreation(false);
+
+  EXPECT_EQ(nullptr, EvalJs(shell(), R"(
+      sharedStorage.worklet.addModule('shared_storage/simple_module2.js');
+    )"));
+
+  EXPECT_EQ(1u, test_worklet_host_manager().GetAttachedWorkletHostsCount());
+  EXPECT_EQ(1u, test_worklet_host_manager().GetKeepAliveWorkletHostsCount());
+
+  // Execute all the deferred messages. This will terminate the keep-alive.
+  test_worklet_host_manager()
+      .GetKeepAliveWorkletHost()
+      ->ExecutePendingWorkletMessages();
+
+  EXPECT_EQ(1u, test_worklet_host_manager().GetAttachedWorkletHostsCount());
+  EXPECT_EQ(0u, test_worklet_host_manager().GetKeepAliveWorkletHostsCount());
+
+  // Expect loggings only from executing top document's worklet.
+  EXPECT_EQ(1u, console_observer.messages().size());
+  EXPECT_EQ("Executing simple_module2.js",
+            base::UTF16ToUTF8(console_observer.messages()[0].message));
+}
+
+IN_PROC_BROWSER_TEST_F(SharedStorageBrowserTest,
+                       RenderProcessHostDestroyedDuringWorkletKeepAlive) {
+  // The test assumes pages gets deleted after navigation, letting the worklet
+  // enter keep-alive phase. To ensure this, disable back/forward cache.
+  content::DisableBackForwardCacheForTesting(
+      shell()->web_contents(),
+      content::BackForwardCache::TEST_ASSUMES_NO_CACHING);
+
+  EXPECT_TRUE(NavigateToURL(
+      shell(), embedded_test_server()->GetURL("a.com", kSimplePagePath)));
+
+  test_worklet_host_manager()
+      .ConfigureShouldDeferWorkletMessagesOnWorkletHostCreation(true);
+
+  WebContentsConsoleObserver console_observer(shell()->web_contents());
+
+  EvalJsResult result = EvalJs(shell(), R"(
+      sharedStorage.worklet.addModule('shared_storage/simple_module.js');
+    )",
+                               EXECUTE_SCRIPT_NO_RESOLVE_PROMISES);
+
+  // Navigate to trigger keep-alive
+  EXPECT_TRUE(NavigateToURL(shell(), GURL(url::kAboutBlankURL)));
+
+  EXPECT_EQ(0u, test_worklet_host_manager().GetAttachedWorkletHostsCount());
+  EXPECT_EQ(1u, test_worklet_host_manager().GetKeepAliveWorkletHostsCount());
+
+  // The BrowserContext will be destroyed right after this test body, which will
+  // cause the RenderProcessHost to be destroyed before the keep-alive
+  // SharedStorageWorkletHost. Expect no fatal error.
+}
+
 }  // namespace content

content/browser/shared_storage/shared_storage_document_service_impl.cc

diff --git a/content/browser/shared_storage/shared_storage_document_service_impl.cc b/content/browser/shared_storage/shared_storage_document_service_impl.cc
index ea47f928..2c1147e 100644
--- a/content/browser/shared_storage/shared_storage_document_service_impl.cc
+++ b/content/browser/shared_storage/shared_storage_document_service_impl.cc
@@ -43,7 +43,15 @@
     return;
   }
 
+  // Initialize the `URLLoaderFactory` now, as later on the worklet may enter
+  // keep-alive phase and won't have access to the `RenderFrameHost`.
+  mojo::PendingRemote<network::mojom::URLLoaderFactory>
+      frame_url_loader_factory;
+  render_frame_host().CreateNetworkServiceDefaultFactory(
+      frame_url_loader_factory.InitWithNewPipeAndPassReceiver());
+
   GetSharedStorageWorkletHost()->AddModuleOnWorklet(
+      std::move(frame_url_loader_factory),
       render_frame_host().GetLastCommittedOrigin(), script_source_url,
       std::move(callback));
 }
@@ -54,6 +62,11 @@
   GetSharedStorageWorkletHost()->RunOperationOnWorklet(name, serialized_data);
 }
 
+base::WeakPtr<SharedStorageDocumentServiceImpl>
+SharedStorageDocumentServiceImpl::GetWeakPtr() {
+  return weak_ptr_factory_.GetWeakPtr();
+}
+
 SharedStorageDocumentServiceImpl::SharedStorageDocumentServiceImpl(
     RenderFrameHost* rfh)
     : DocumentUserData<SharedStorageDocumentServiceImpl>(rfh) {}

content/browser/shared_storage/shared_storage_document_service_impl.h

diff --git a/content/browser/shared_storage/shared_storage_document_service_impl.h b/content/browser/shared_storage/shared_storage_document_service_impl.h
index fb00dd05..45a84d1 100644
--- a/content/browser/shared_storage/shared_storage_document_service_impl.h
+++ b/content/browser/shared_storage/shared_storage_document_service_impl.h
@@ -35,6 +35,8 @@
       const std::string& name,
       const std::vector<uint8_t>& serialized_data) override;
 
+  base::WeakPtr<SharedStorageDocumentServiceImpl> GetWeakPtr();
+
  private:
   friend class DocumentUserData;
 

content/browser/shared_storage/shared_storage_render_thread_worklet_driver.cc

diff --git a/content/browser/shared_storage/shared_storage_render_thread_worklet_driver.cc b/content/browser/shared_storage/shared_storage_render_thread_worklet_driver.cc
index 1a83d18..8029c7d 100644
--- a/content/browser/shared_storage/shared_storage_render_thread_worklet_driver.cc
+++ b/content/browser/shared_storage/shared_storage_render_thread_worklet_driver.cc
@@ -6,23 +6,65 @@
 
 #include "content/browser/renderer_host/agent_scheduling_group_host.h"
 #include "content/common/renderer.mojom.h"
+#include "content/public/browser/render_process_host.h"
 #include "content/services/shared_storage_worklet/public/mojom/shared_storage_worklet_service.mojom.h"
 
 namespace content {
 
 SharedStorageRenderThreadWorkletDriver::SharedStorageRenderThreadWorkletDriver(
-    AgentSchedulingGroupHost& agent_scheduling_group_host)
-    : agent_scheduling_group_host_(agent_scheduling_group_host) {}
+    AgentSchedulingGroupHost* agent_scheduling_group_host)
+    : agent_scheduling_group_host_(agent_scheduling_group_host) {
+  agent_scheduling_group_host_->GetProcess()->AddObserver(this);
+
+  // The RefCount could be disabled only when the browsing context is being
+  // destroyed. Since this driver will always be created when the browsing
+  // context is alive, it's fine to DCHECK that the RefCount is enabled.
+  DCHECK(!agent_scheduling_group_host_->GetProcess()->AreRefCountsDisabled());
+  agent_scheduling_group_host_->GetProcess()->IncrementWorkerRefCount();
+}
 
 SharedStorageRenderThreadWorkletDriver::
-    ~SharedStorageRenderThreadWorkletDriver() = default;
+    ~SharedStorageRenderThreadWorkletDriver() {
+  // The render process is already destroyed. No further action is needed.
+  if (!agent_scheduling_group_host_)
+    return;
+
+  agent_scheduling_group_host_->GetProcess()->RemoveObserver(this);
+
+  // The RefCount could be disabled only when the browsing context is being
+  // destroyed. In that case, the `RenderProcessHostDestroyed` is guaranteed to
+  // be called first to set `agent_scheduling_group_host_` to nullptr. Thus,
+  // here it's fine to DCHECK that the RefCount is enabled.
+  DCHECK(!agent_scheduling_group_host_->GetProcess()->AreRefCountsDisabled());
+  agent_scheduling_group_host_->GetProcess()->DecrementWorkerRefCount();
+}
 
 void SharedStorageRenderThreadWorkletDriver::StartWorkletService(
     mojo::PendingReceiver<
         shared_storage_worklet::mojom::SharedStorageWorkletService>
         pending_receiver) {
-  agent_scheduling_group_host_.CreateSharedStorageWorkletService(
+  // `StartWorkletService` will be called right after the driver is created when
+  // the document is still alive, as the driver is created on-demand on the
+  // first worklet operation. Thus, the `agent_scheduling_group_host_` should
+  // always be valid at this point.
+  DCHECK(agent_scheduling_group_host_);
+
+  agent_scheduling_group_host_->CreateSharedStorageWorkletService(
       std::move(pending_receiver));
 }
 
+void SharedStorageRenderThreadWorkletDriver::RenderProcessHostDestroyed(
+    RenderProcessHost* host) {
+  // This could occur when the browser shuts down during the worklet's
+  // keep-alive phase, or when the renderer process is terminated. Invalidate
+  // the pointers to signal this state change.
+  if (agent_scheduling_group_host_->GetProcess() == host) {
+    agent_scheduling_group_host_->GetProcess()->RemoveObserver(this);
+
+    // The destruction of RenderProcessHost implies that the
+    // AgentSchedulingGroupHost is going to be destroyed as well.
+    agent_scheduling_group_host_ = nullptr;
+  }
+}
+
 }  // namespace content

content/browser/shared_storage/shared_storage_render_thread_worklet_driver.h

diff --git a/content/browser/shared_storage/shared_storage_render_thread_worklet_driver.h b/content/browser/shared_storage/shared_storage_render_thread_worklet_driver.h
index 6cc0803b..daed493 100644
--- a/content/browser/shared_storage/shared_storage_render_thread_worklet_driver.h
+++ b/content/browser/shared_storage/shared_storage_render_thread_worklet_driver.h
@@ -7,21 +7,24 @@
 
 #include "content/browser/shared_storage/shared_storage_worklet_driver.h"
 
+#include "content/public/browser/render_process_host_observer.h"
+
 namespace content {
 
 class AgentSchedulingGroupHost;
+class RenderProcessHost;
 
 // The worklet driver that starts the worklet service on a dedicated render
 // thread on the same render process that the worklet's owner document belongs
 // to.
 //
-// The lifetime of the WorkletDriver is tied to the RenderFrameHost associated
-// with the worklet's owner document.
+// The lifetime of the WorkletDriver is tied to the `SharedStorageWorkletHost`.
 class SharedStorageRenderThreadWorkletDriver
-    : public SharedStorageWorkletDriver {
+    : public SharedStorageWorkletDriver,
+      public RenderProcessHostObserver {
  public:
   explicit SharedStorageRenderThreadWorkletDriver(
-      AgentSchedulingGroupHost& agent_scheduling_group_host);
+      AgentSchedulingGroupHost* agent_scheduling_group_host);
   ~SharedStorageRenderThreadWorkletDriver() override;
 
   // SharedStorageWorkletDriver overrides
@@ -30,9 +33,21 @@
           shared_storage_worklet::mojom::SharedStorageWorkletService>
           pending_receiver) override;
 
+  // RenderProcessHostObserver overrides
+  void RenderProcessHostDestroyed(RenderProcessHost* host) override;
+
  private:
-  // Responsible for initializing the worklet service.
-  AgentSchedulingGroupHost& agent_scheduling_group_host_;
+  // Responsible for initializing the worklet service and for incrementing/
+  // decrementing the `RenderProcessHost`'s keep-alive counter. This will be
+  // initialized to a valid `AgentSchedulingGroupHost` when the driver is
+  // created, and will be reset to nullptr when the `AgentSchedulingGroupHost`
+  // is about to be destroyed.
+  //
+  // TODO(crbug.com/1141459): Once AgentSchedulingGroupHostObserver exists, we
+  // need to use it to track the lifetime of `agent_scheduling_group_host_`
+  // instead of RenderProcessHostObserver. For more context see
+  // crbug.com/1141459#c4.
+  AgentSchedulingGroupHost* agent_scheduling_group_host_;
 };
 
 }  // namespace content

content/browser/shared_storage/shared_storage_url_loader_factory_proxy.cc

diff --git a/content/browser/shared_storage/shared_storage_url_loader_factory_proxy.cc b/content/browser/shared_storage/shared_storage_url_loader_factory_proxy.cc
index 5d19e28..ca0ea14 100644
--- a/content/browser/shared_storage/shared_storage_url_loader_factory_proxy.cc
+++ b/content/browser/shared_storage/shared_storage_url_loader_factory_proxy.cc
@@ -31,12 +31,13 @@
 namespace content {
 
 SharedStorageURLLoaderFactoryProxy::SharedStorageURLLoaderFactoryProxy(
+    mojo::PendingRemote<network::mojom::URLLoaderFactory>
+        frame_url_loader_factory,
     mojo::PendingReceiver<network::mojom::URLLoaderFactory> pending_receiver,
-    GetUrlLoaderFactoryCallback get_url_loader_factory,
     const url::Origin& frame_origin,
     const GURL& script_url)
-    : receiver_(this, std::move(pending_receiver)),
-      get_url_loader_factory_(std::move(get_url_loader_factory)),
+    : frame_url_loader_factory_(std::move(frame_url_loader_factory)),
+      receiver_(this, std::move(pending_receiver)),
       frame_origin_(frame_origin),
       script_url_(script_url) {}
 
@@ -66,7 +67,9 @@
   new_request.request_initiator = frame_origin_;
   new_request.mode = network::mojom::RequestMode::kSameOrigin;
 
-  get_url_loader_factory_.Run()->CreateLoaderAndStart(
+  // TODO(crbug/1268616): create a new factory when the current one gets
+  // disconnected.
+  frame_url_loader_factory_->CreateLoaderAndStart(
       std::move(receiver), GlobalRequestID::MakeBrowserInitiated().request_id,
       network::mojom::kURLLoadOptionNone, new_request, std::move(client),
       traffic_annotation);

content/browser/shared_storage/shared_storage_url_loader_factory_proxy.h

diff --git a/content/browser/shared_storage/shared_storage_url_loader_factory_proxy.h b/content/browser/shared_storage/shared_storage_url_loader_factory_proxy.h
index 83d7ff7e..d1c3b6c 100644
--- a/content/browser/shared_storage/shared_storage_url_loader_factory_proxy.h
+++ b/content/browser/shared_storage/shared_storage_url_loader_factory_proxy.h
@@ -13,6 +13,7 @@
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
 #include "mojo/public/cpp/bindings/receiver.h"
+#include "mojo/public/cpp/bindings/remote.h"
 #include "net/traffic_annotation/network_traffic_annotation.h"
 #include "services/network/public/mojom/url_loader_factory.mojom.h"
 #include "url/gurl.h"
@@ -25,12 +26,10 @@
 class CONTENT_EXPORT SharedStorageURLLoaderFactoryProxy
     : public network::mojom::URLLoaderFactory {
  public:
-  using GetUrlLoaderFactoryCallback =
-      base::RepeatingCallback<network::mojom::URLLoaderFactory*()>;
-
   SharedStorageURLLoaderFactoryProxy(
+      mojo::PendingRemote<network::mojom::URLLoaderFactory>
+          frame_url_loader_factory,
       mojo::PendingReceiver<network::mojom::URLLoaderFactory> pending_receiver,
-      GetUrlLoaderFactoryCallback get_url_loader_factory,
       const url::Origin& frame_origin,
       const GURL& script_url);
   SharedStorageURLLoaderFactoryProxy(
@@ -52,9 +51,9 @@
       override;
 
  private:
-  mojo::Receiver<network::mojom::URLLoaderFactory> receiver_;
+  mojo::Remote<network::mojom::URLLoaderFactory> frame_url_loader_factory_;
 
-  const GetUrlLoaderFactoryCallback get_url_loader_factory_;
+  mojo::Receiver<network::mojom::URLLoaderFactory> receiver_;
 
   const url::Origin frame_origin_;
 

content/browser/shared_storage/shared_storage_url_loader_factory_proxy_unittest.cc

diff --git a/content/browser/shared_storage/shared_storage_url_loader_factory_proxy_unittest.cc b/content/browser/shared_storage/shared_storage_url_loader_factory_proxy_unittest.cc
index 003fe737..91c3d55 100644
--- a/content/browser/shared_storage/shared_storage_url_loader_factory_proxy_unittest.cc
+++ b/content/browser/shared_storage/shared_storage_url_loader_factory_proxy_unittest.cc
@@ -60,14 +60,14 @@
            !remote_url_loader_factory_.is_connected());
 
     remote_url_loader_factory_.reset();
+
+    mojo::Remote<network::mojom::URLLoaderFactory> factory;
+    proxied_url_loader_factory_.Clone(factory.BindNewPipeAndPassReceiver());
+
     url_loader_factory_proxy_ =
         std::make_unique<SharedStorageURLLoaderFactoryProxy>(
+            factory.Unbind(),
             remote_url_loader_factory_.BindNewPipeAndPassReceiver(),
-            base::BindRepeating(
-                [](network::mojom::URLLoaderFactory* factory) {
-                  return factory;
-                },
-                &proxied_url_loader_factory_),
             frame_origin_, GURL(kScriptUrl));
   }
 

content/browser/shared_storage/shared_storage_worklet_host.cc

diff --git a/content/browser/shared_storage/shared_storage_worklet_host.cc b/content/browser/shared_storage/shared_storage_worklet_host.cc
index ffec13f..4bfe0f4 100644
--- a/content/browser/shared_storage/shared_storage_worklet_host.cc
+++ b/content/browser/shared_storage/shared_storage_worklet_host.cc
@@ -6,25 +6,36 @@
 
 #include "content/browser/devtools/devtools_instrumentation.h"
 #include "content/browser/renderer_host/render_frame_host_impl.h"
+#include "content/browser/shared_storage/shared_storage_document_service_impl.h"
 #include "content/browser/shared_storage/shared_storage_url_loader_factory_proxy.h"
 #include "content/browser/shared_storage/shared_storage_worklet_driver.h"
 #include "content/common/renderer.mojom.h"
 
 namespace content {
 
+namespace {
+
+constexpr base::TimeDelta kKeepAliveTimeout = base::Seconds(2);
+
+}  // namespace
+
 SharedStorageWorkletHost::SharedStorageWorkletHost(
     std::unique_ptr<SharedStorageWorkletDriver> driver,
-    RenderFrameHost& rfh)
+    SharedStorageDocumentServiceImpl& document_service)
     : driver_(std::move(driver)),
-      render_frame_host_(static_cast<RenderFrameHostImpl&>(rfh)) {}
+      document_service_(document_service.GetWeakPtr()) {}
 
 SharedStorageWorkletHost::~SharedStorageWorkletHost() = default;
 
 void SharedStorageWorkletHost::AddModuleOnWorklet(
+    mojo::PendingRemote<network::mojom::URLLoaderFactory>
+        frame_url_loader_factory,
     const url::Origin& frame_origin,
     const GURL& script_source_url,
     blink::mojom::SharedStorageDocumentService::AddModuleOnWorkletCallback
         callback) {
+  IncrementPendingOperationsCount();
+
   if (add_module_state_ == AddModuleState::kInitiated) {
     OnAddModuleOnWorkletFinished(
         std::move(callback), /*success=*/false,
@@ -40,11 +51,9 @@
 
   url_loader_factory_proxy_ =
       std::make_unique<SharedStorageURLLoaderFactoryProxy>(
-          url_loader_factory.InitWithNewPipeAndPassReceiver(),
-          base::BindRepeating(
-              &SharedStorageWorkletHost::GetFrameURLLoaderFactory,
-              base::Unretained(this)),
-          frame_origin, script_source_url);
+          std::move(frame_url_loader_factory),
+          url_loader_factory.InitWithNewPipeAndPassReceiver(), frame_origin,
+          script_source_url);
 
   GetAndConnectToSharedStorageWorkletService()->AddModule(
       std::move(url_loader_factory), script_source_url,
@@ -55,6 +64,8 @@
 void SharedStorageWorkletHost::RunOperationOnWorklet(
     const std::string& name,
     const std::vector<uint8_t>& serialized_data) {
+  IncrementPendingOperationsCount();
+
   if (add_module_state_ != AddModuleState::kInitiated) {
     OnRunOperationOnWorkletFinished(
         /*success=*/false,
@@ -70,6 +81,26 @@
                      weak_ptr_factory_.GetWeakPtr()));
 }
 
+bool SharedStorageWorkletHost::HasPendingOperations() {
+  return pending_operations_count_ > 0;
+}
+
+void SharedStorageWorkletHost::EnterKeepAliveOnDocumentDestroyed(
+    KeepAliveFinishedCallback callback) {
+  // At this point the `SharedStorageDocumentServiceImpl` is being destroyed, so
+  // `document_service_` is still valid. But it will be auto reset soon after.
+  DCHECK(document_service_);
+  DCHECK(HasPendingOperations());
+  DCHECK(keep_alive_finished_callback_.is_null());
+
+  keep_alive_finished_callback_ = std::move(callback);
+
+  keep_alive_timer_.Start(
+      FROM_HERE, GetKeepAliveTimeout(),
+      base::BindOnce(&SharedStorageWorkletHost::FinishKeepAlive,
+                     weak_ptr_factory_.GetWeakPtr()));
+}
+
 void SharedStorageWorkletHost::SharedStorageSet(
     const std::string& key,
     const std::string& value,
@@ -165,10 +196,16 @@
 }
 
 void SharedStorageWorkletHost::ConsoleLog(const std::string& message) {
+  if (!document_service_) {
+    DCHECK(IsInKeepAlivePhase());
+    return;
+  }
+
   DCHECK(add_module_state_ == AddModuleState::kInitiated);
 
   devtools_instrumentation::LogWorkletMessage(
-      render_frame_host_, blink::mojom::ConsoleMessageLevel::kInfo, message);
+      static_cast<RenderFrameHostImpl&>(document_service_->render_frame_host()),
+      blink::mojom::ConsoleMessageLevel::kInfo, message);
 }
 
 void SharedStorageWorkletHost::OnAddModuleOnWorkletFinished(
@@ -177,27 +214,52 @@
     bool success,
     const std::string& error_message) {
   std::move(callback).Run(success, error_message);
+
+  DecrementPendingOperationsCount();
 }
 
 void SharedStorageWorkletHost::OnRunOperationOnWorkletFinished(
     bool success,
     const std::string& error_message) {
-  if (success)
-    return;
-
-  devtools_instrumentation::LogWorkletMessage(
-      render_frame_host_, blink::mojom::ConsoleMessageLevel::kError,
-      error_message);
-}
-
-network::mojom::URLLoaderFactory*
-SharedStorageWorkletHost::GetFrameURLLoaderFactory() {
-  if (!frame_url_loader_factory_) {
-    render_frame_host_.CreateNetworkServiceDefaultFactory(
-        frame_url_loader_factory_.BindNewPipeAndPassReceiver());
+  if (!success && document_service_) {
+    DCHECK(!IsInKeepAlivePhase());
+    devtools_instrumentation::LogWorkletMessage(
+        static_cast<RenderFrameHostImpl&>(
+            document_service_->render_frame_host()),
+        blink::mojom::ConsoleMessageLevel::kError, error_message);
   }
 
-  return frame_url_loader_factory_.get();
+  DecrementPendingOperationsCount();
+}
+
+bool SharedStorageWorkletHost::IsInKeepAlivePhase() const {
+  return !!keep_alive_finished_callback_;
+}
+
+void SharedStorageWorkletHost::FinishKeepAlive() {
+  // This will remove this worklet host from the manager.
+  std::move(keep_alive_finished_callback_).Run(this);
+
+  // Do not add code after this. SharedStorageWorkletHost has been destroyed.
+}
+
+void SharedStorageWorkletHost::IncrementPendingOperationsCount() {
+  base::CheckedNumeric<uint32_t> count = pending_operations_count_;
+  pending_operations_count_ = (++count).ValueOrDie();
+}
+
+void SharedStorageWorkletHost::DecrementPendingOperationsCount() {
+  base::CheckedNumeric<uint32_t> count = pending_operations_count_;
+  pending_operations_count_ = (--count).ValueOrDie();
+
+  if (!IsInKeepAlivePhase() || pending_operations_count_)
+    return;
+
+  FinishKeepAlive();
+}
+
+base::TimeDelta SharedStorageWorkletHost::GetKeepAliveTimeout() const {
+  return kKeepAliveTimeout;
 }
 
 shared_storage_worklet::mojom::SharedStorageWorkletService*

content/browser/shared_storage/shared_storage_worklet_host.h

diff --git a/content/browser/shared_storage/shared_storage_worklet_host.h b/content/browser/shared_storage/shared_storage_worklet_host.h
index b5d24c78..9c8fb78 100644
--- a/content/browser/shared_storage/shared_storage_worklet_host.h
+++ b/content/browser/shared_storage/shared_storage_worklet_host.h
@@ -15,21 +15,24 @@
 
 namespace content {
 
+class SharedStorageDocumentServiceImpl;
 class SharedStorageURLLoaderFactoryProxy;
 class SharedStorageWorkletDriver;
-class RenderFrameHost;
-class RenderFrameHostImpl;
 
-// The worklet host is responsible for getting worklet operation requests
-// (i.e. addModule and runOperation) from the renderer and running it on the
-// worklet service. It will also handle the commands from the worklet service
-// (i.e. storage access, console log) which could happen while running those
-// worklet operations.
+// The SharedStorageWorkletHost is responsible for getting worklet operation
+// requests (i.e. addModule and runOperation) from the renderer (i.e. document
+// that is hosting the worklet) and running it on the
+// `SharedStorageWorkletService`. It will also handle the commands from the
+// `SharedStorageWorkletService` (i.e. storage access, console log) which
+// could happen while running those worklet operations.
 //
-// The SharedStorageWorkletHost lives in the SharedStorageWorkletHostManager,
-// and worklet host's lifetime is bounded by the lifetime of the document, as
-// when the document is destroyed, it will tell the worklet host manager to
-// destroy the corresponding worklet host.
+// The SharedStorageWorkletHost lives in the `SharedStorageWorkletHostManager`,
+// and the SharedStorageWorkletHost's lifetime is bounded by the earliest of the
+// two timepoints:
+// 1. When the outstanding worklet operations have finished on or after the
+// document's destruction, but before the keepalive timeout.
+// 2. The keepalive timeout is reached after the worklet's owner document is
+// destroyed.
 class CONTENT_EXPORT SharedStorageWorkletHost
     : public shared_storage_worklet::mojom::SharedStorageWorkletServiceClient {
  public:
@@ -38,12 +41,17 @@
     kInitiated,
   };
 
+  using KeepAliveFinishedCallback =
+      base::OnceCallback<void(SharedStorageWorkletHost*)>;
+
   explicit SharedStorageWorkletHost(
       std::unique_ptr<SharedStorageWorkletDriver> driver,
-      RenderFrameHost& rfh);
+      SharedStorageDocumentServiceImpl& document_service);
   ~SharedStorageWorkletHost() override;
 
   void AddModuleOnWorklet(
+      mojo::PendingRemote<network::mojom::URLLoaderFactory>
+          frame_url_loader_factory,
       const url::Origin& frame_origin,
       const GURL& script_source_url,
       blink::mojom::SharedStorageDocumentService::AddModuleOnWorkletCallback
@@ -51,6 +59,14 @@
   void RunOperationOnWorklet(const std::string& name,
                              const std::vector<uint8_t>& serialized_data);
 
+  // Whether there are unfinished worklet operations (i.e. addModule() and
+  // runOperation()).
+  bool HasPendingOperations();
+
+  // Called by the `SharedStorageWorkletHostManager` for this host to enter
+  // keep-alive phase.
+  void EnterKeepAliveOnDocumentDestroyed(KeepAliveFinishedCallback callback);
+
   // shared_storage_worklet::mojom::SharedStorageWorkletServiceClient.
   void SharedStorageSet(const std::string& key,
                         const std::string& value,
@@ -87,21 +103,54 @@
       bool success,
       const std::string& error_message);
 
+  base::OneShotTimer& GetKeepAliveTimerForTesting() {
+    return keep_alive_timer_;
+  }
+
  private:
-  network::mojom::URLLoaderFactory* GetFrameURLLoaderFactory();
+  // Returns whether the the worklet has entered keep-alive phase. During
+  // keep-alive: the attempt to log console messages will be ignored; and the
+  // completion of the last pending operation will terminate the worklet.
+  bool IsInKeepAlivePhase() const;
+
+  // Run `keep_alive_finished_callback_` to destroy `this`. Called when the last
+  // pending operation has finished, or when a timeout is reached after entering
+  // the keep-alive phase.
+  void FinishKeepAlive();
+
+  // Increment `pending_operations_count_`. Called when receiving a addModule
+  // or runOperation operation.
+  void IncrementPendingOperationsCount();
+
+  // Decrement `pending_operations_count_`. Called when finishing handling a
+  // addModule or runOperation operation.
+  void DecrementPendingOperationsCount();
+
+  // virtual for testing
+  virtual base::TimeDelta GetKeepAliveTimeout() const;
 
   shared_storage_worklet::mojom::SharedStorageWorkletService*
   GetAndConnectToSharedStorageWorkletService();
 
   AddModuleState add_module_state_ = AddModuleState::kNotInitiated;
 
-  // Responsible for initializing the worklet service.
+  // Responsible for initializing the `SharedStorageWorkletService`.
   std::unique_ptr<SharedStorageWorkletDriver> driver_;
 
-  // 'render_frame_host_' is the RenderFrameHostImpl returned from the document
-  // service, and since `this`'s lifetime is tied to the Document service's,
-  // this reference will always be valid.
-  RenderFrameHostImpl& render_frame_host_;
+  // When this worklet is created, `document_service_` is set to the associated
+  // `SharedStorageDocumentServiceImpl` and is always valid. Reset automatically
+  // when `SharedStorageDocumentServiceImpl` is destroyed.
+  base::WeakPtr<SharedStorageDocumentServiceImpl> document_service_;
+
+  // The number of unfinished worklet requests, including addModule and
+  // runOperation.
+  uint32_t pending_operations_count_ = 0u;
+
+  // Timer for starting and ending the keep-alive phase.
+  base::OneShotTimer keep_alive_timer_;
+
+  // Set when the worklet host enters keep-alive phase.
+  KeepAliveFinishedCallback keep_alive_finished_callback_;
 
   // Both `shared_storage_worklet_service_`
   // and `shared_storage_worklet_service_client_` are bound in
@@ -124,11 +173,6 @@
   // application/javascript request header; to enforce same-origin mode; etc.
   std::unique_ptr<SharedStorageURLLoaderFactoryProxy> url_loader_factory_proxy_;
 
-  // The default url loader factory for the frame to create the loader and start
-  // request. This will be initialized on demand after
-  // `url_loader_factory_proxy_` successfully sanitizes the initial request.
-  mojo::Remote<network::mojom::URLLoaderFactory> frame_url_loader_factory_;
-
   base::WeakPtrFactory<SharedStorageWorkletHost> weak_ptr_factory_{this};
 };
 

content/browser/shared_storage/shared_storage_worklet_host_manager.cc

diff --git a/content/browser/shared_storage/shared_storage_worklet_host_manager.cc b/content/browser/shared_storage/shared_storage_worklet_host_manager.cc
index dedf55e..9cc0fea 100644
--- a/content/browser/shared_storage/shared_storage_worklet_host_manager.cc
+++ b/content/browser/shared_storage/shared_storage_worklet_host_manager.cc
@@ -16,30 +16,48 @@
 
 void SharedStorageWorkletHostManager::OnDocumentServiceDestroyed(
     SharedStorageDocumentServiceImpl* document_service) {
-  // Note: `shared_storage_worklet_hosts_` will be populated when there's an
-  // actual worklet operation request, but the document service will call this
-  // method on destruction irrespectively, so it may not exist in map.
-  shared_storage_worklet_hosts_.erase(document_service);
+  // Note: `attached_shared_storage_worklet_hosts_` will be populated when
+  // there's an actual worklet operation request, but the
+  // `SharedStorageDocumentServiceImpl` will call this method on destruction
+  // irrespectively, so it may not exist in map.
+  auto it = attached_shared_storage_worklet_hosts_.find(document_service);
+  if (it == attached_shared_storage_worklet_hosts_.end())
+    return;
+
+  SharedStorageWorkletHost* worklet_host = it->second.get();
+  if (!worklet_host->HasPendingOperations()) {
+    attached_shared_storage_worklet_hosts_.erase(it);
+    return;
+  }
+
+  DCHECK(!keep_alive_shared_storage_worklet_hosts_.count(worklet_host));
+  keep_alive_shared_storage_worklet_hosts_.insert(
+      {worklet_host, std::move(it->second)});
+
+  attached_shared_storage_worklet_hosts_.erase(it);
+
+  worklet_host->EnterKeepAliveOnDocumentDestroyed(base::BindOnce(
+      &SharedStorageWorkletHostManager::OnWorkletKeepAliveFinished,
+      base::Unretained(this)));
 }
 
 SharedStorageWorkletHost*
 SharedStorageWorkletHostManager::GetOrCreateSharedStorageWorkletHost(
     SharedStorageDocumentServiceImpl* document_service) {
-  auto it = shared_storage_worklet_hosts_.find(document_service);
-  if (it != shared_storage_worklet_hosts_.end())
+  auto it = attached_shared_storage_worklet_hosts_.find(document_service);
+  if (it != attached_shared_storage_worklet_hosts_.end())
     return it->second.get();
 
   auto driver = std::make_unique<SharedStorageRenderThreadWorkletDriver>(
-      static_cast<RenderFrameHostImpl&>(document_service->render_frame_host())
-          .GetAgentSchedulingGroup());
+      &(static_cast<RenderFrameHostImpl&>(document_service->render_frame_host())
+            .GetAgentSchedulingGroup()));
 
   std::unique_ptr<SharedStorageWorkletHost> worklet_host =
-      CreateSharedStorageWorkletHost(std::move(driver),
-                                     document_service->render_frame_host());
+      CreateSharedStorageWorkletHost(std::move(driver), *document_service);
 
   SharedStorageWorkletHost* worklet_host_ptr = worklet_host.get();
 
-  shared_storage_worklet_hosts_.insert(
+  attached_shared_storage_worklet_hosts_.insert(
       {document_service, std::move(worklet_host)});
   return worklet_host_ptr;
 }
@@ -47,9 +65,15 @@
 std::unique_ptr<SharedStorageWorkletHost>
 SharedStorageWorkletHostManager::CreateSharedStorageWorkletHost(
     std::unique_ptr<SharedStorageWorkletDriver> driver,
-    RenderFrameHost& render_frame_host) {
+    SharedStorageDocumentServiceImpl& document_service) {
   return std::make_unique<SharedStorageWorkletHost>(std::move(driver),
-                                                    render_frame_host);
+                                                    document_service);
+}
+
+void SharedStorageWorkletHostManager::OnWorkletKeepAliveFinished(
+    SharedStorageWorkletHost* worklet_host) {
+  DCHECK(keep_alive_shared_storage_worklet_hosts_.count(worklet_host));
+  keep_alive_shared_storage_worklet_hosts_.erase(worklet_host);
 }
 
 }  // namespace content

content/browser/shared_storage/shared_storage_worklet_host_manager.h

diff --git a/content/browser/shared_storage/shared_storage_worklet_host_manager.h b/content/browser/shared_storage/shared_storage_worklet_host_manager.h
index 72345b9..8b8fb7d6 100644
--- a/content/browser/shared_storage/shared_storage_worklet_host_manager.h
+++ b/content/browser/shared_storage/shared_storage_worklet_host_manager.h
@@ -12,13 +12,12 @@
 
 namespace content {
 
-class SharedStorageWorkletHost;
 class SharedStorageDocumentServiceImpl;
 class SharedStorageWorkletDriver;
-class RenderFrameHost;
+class SharedStorageWorkletHost;
 
-// Manages the creation and destruction of worklet hosts. The manager is bound
-// to the StoragePartition.
+// Manages the creation and destruction of the `SharedStorageWorkletHost`. The
+// manager is bound to the StoragePartition.
 class CONTENT_EXPORT SharedStorageWorkletHostManager {
  public:
   SharedStorageWorkletHostManager();
@@ -33,24 +32,40 @@
  protected:
   const std::map<SharedStorageDocumentServiceImpl*,
                  std::unique_ptr<SharedStorageWorkletHost>>&
-  GetWorkletHostsForTesting() {
-    return shared_storage_worklet_hosts_;
+  GetAttachedWorkletHostsForTesting() {
+    return attached_shared_storage_worklet_hosts_;
   }
 
+  const std::map<SharedStorageWorkletHost*,
+                 std::unique_ptr<SharedStorageWorkletHost>>&
+  GetKeepAliveWorkletHostsForTesting() {
+    return keep_alive_shared_storage_worklet_hosts_;
+  }
+
+  void OnWorkletKeepAliveFinished(SharedStorageWorkletHost*);
+
   // virtual for testing
   virtual std::unique_ptr<SharedStorageWorkletHost>
   CreateSharedStorageWorkletHost(
       std::unique_ptr<SharedStorageWorkletDriver> driver,
-      RenderFrameHost& render_frame_host);
+      SharedStorageDocumentServiceImpl& document_service);
 
  private:
-  // Those worklet hosts are created on demand when the
-  // `SharedStorageDocumentServiceImpl` requests it. They will be removed from
-  // the map when the corresponding document is destructed (where it will call
-  // `OnDocumentServiceDestroyed`).
+  // The hosts that are attached to the worklet's owner document. Those hosts
+  // are created on demand when the `SharedStorageDocumentServiceImpl` requests
+  // it. When the corresponding document is destructed (where it will call
+  // `OnDocumentServiceDestroyed`), those hosts will either be removed from this
+  // map entirely, or will be moved from this map to
+  // `keep_alive_shared_storage_worklet_hosts_`, depending on whether there are
+  // pending operations.
   std::map<SharedStorageDocumentServiceImpl*,
            std::unique_ptr<SharedStorageWorkletHost>>
-      shared_storage_worklet_hosts_;
+      attached_shared_storage_worklet_hosts_;
+
+  // The hosts that are detached from the worklet's owner document and have
+  // entered keep-alive phase.
+  std::map<SharedStorageWorkletHost*, std::unique_ptr<SharedStorageWorkletHost>>
+      keep_alive_shared_storage_worklet_hosts_;
 };
 
 }  // namespace content

content/browser/storage_partition_impl_unittest.cc

diff --git a/content/browser/storage_partition_impl_unittest.cc b/content/browser/storage_partition_impl_unittest.cc
index a54ba98..8f596bb 100644
--- a/content/browser/storage_partition_impl_unittest.cc
+++ b/content/browser/storage_partition_impl_unittest.cc
@@ -2028,10 +2028,10 @@
                                           .SetExpiry(base::Days(2))
                                           .Build());
     attribution_manager->HandleTrigger(
-        StorableTrigger(123, net::SchemefulSite(conv), reporter,
-                        /*event_source_trigger_data=*/0,
-                        /*priority=*/0,
-                        /*dedup_key=*/absl::nullopt));
+        TriggerBuilder()
+            .SetConversionDestination(net::SchemefulSite(conv))
+            .SetReportingOrigin(reporter)
+            .Build());
   }
 
   EXPECT_EQ(5u, GetAttributionsToReportForTesting(attribution_manager,

content/gpu/gpu_sandbox_hook_linux.cc

diff --git a/content/gpu/gpu_sandbox_hook_linux.cc b/content/gpu/gpu_sandbox_hook_linux.cc
index db9de09..68971b6 100644
--- a/content/gpu/gpu_sandbox_hook_linux.cc
+++ b/content/gpu/gpu_sandbox_hook_linux.cc
@@ -212,9 +212,21 @@
 }
 
 void AddAmdGpuPermissions(std::vector<BrokerFilePermission>* permissions) {
-  static const char* const kReadOnlyList[] = {"/etc/ld.so.cache",
-                                              "/usr/lib64/libEGL.so.1",
-                                              "/usr/lib64/libGLESv2.so.2"};
+  static const char* const kReadOnlyList[] = {
+      "/etc/ld.so.cache",
+      // To support threads in mesa we use --gpu-sandbox-start-early and
+      // that requires the following libs and files to be accessible.
+      "/usr/lib64/libEGL.so.1",
+      "/usr/lib64/libGLESv2.so.2",
+      "/usr/lib64/libglapi.so.0",
+      "/usr/lib64/dri/r300_dri.so",
+      "/usr/lib64/dri/r600_dri.so",
+      "/usr/lib64/dri/radeonsi_dri.so",
+      // Allow libglvnd files and libs.
+      "/usr/share/glvnd/egl_vendor.d",
+      "/usr/share/glvnd/egl_vendor.d/50_mesa.json",
+      "/usr/lib64/libEGL_mesa.so.0",
+      "/usr/lib64/libGLdispatch.so.0"};
   for (const char* item : kReadOnlyList)
     permissions->push_back(BrokerFilePermission::ReadOnly(item));
 

content/public/browser/render_process_host.h

diff --git a/content/public/browser/render_process_host.h b/content/public/browser/render_process_host.h
index a2aad54..214d17b 100644
--- a/content/public/browser/render_process_host.h
+++ b/content/public/browser/render_process_host.h
@@ -453,6 +453,18 @@
   //    the renderer process to be alive. The ref count is incremented when
   //    a shared worker is created in the process, and decremented when
   //    it is terminated (it self-destructs when it no longer has clients).
+  //  - Shared Storage Worklet:
+  //    (https://github.com/pythagoraskitty/shared-storage)
+  //    While there are shared storage worklets who live in this process, they
+  //    wish the renderer process to be alive. The ref count is incremented when
+  //    a shared storage worklet is created in the process, and decremented when
+  //    it is terminated (after the document is destroyed, the worklet
+  //    will be destroyed when all pending operations have finished or a timeout
+  //    is reached). Note that this is only relevant for the implementation of
+  //    shared storage worklets that run in the renderer process. The actual
+  //    process that the shared storage worklets are going to use is determined
+  //    by the concrete implementation of
+  //    `SharedStorageRenderThreadWorkletDriver`.
   virtual void IncrementWorkerRefCount() = 0;
   virtual void DecrementWorkerRefCount() = 0;
 

content/web_test/browser/web_test_browser_main_runner.cc

diff --git a/content/web_test/browser/web_test_browser_main_runner.cc b/content/web_test/browser/web_test_browser_main_runner.cc
index d3a5c7a..6fc9e6f2 100644
--- a/content/web_test/browser/web_test_browser_main_runner.cc
+++ b/content/web_test/browser/web_test_browser_main_runner.cc
@@ -139,11 +139,8 @@
   // only default to a software GL if the flag isn't already specified.
   if (!command_line.HasSwitch(switches::kUseGpuInTests) &&
       !command_line.HasSwitch(switches::kUseGL)) {
-    bool legacy_software_gl = true;
-#if defined(OS_LINUX) || defined(OS_WIN)
     // This setting makes web tests run on SwANGLE instead of SwiftShader GL.
-    legacy_software_gl = false;
-#endif
+    bool legacy_software_gl = false;
     gl::SetSoftwareGLCommandLineSwitches(&command_line, legacy_software_gl);
   }
   command_line.AppendSwitchASCII(switches::kTouchEventFeatureDetection,

device/bluetooth/bluetooth_adapter_mac.h

diff --git a/device/bluetooth/bluetooth_adapter_mac.h b/device/bluetooth/bluetooth_adapter_mac.h
index 1284486..c17fded 100644
--- a/device/bluetooth/bluetooth_adapter_mac.h
+++ b/device/bluetooth/bluetooth_adapter_mac.h
@@ -97,6 +97,8 @@
       AdvertisementErrorCallback error_callback) override;
   BluetoothLocalGattService* GetGattService(
       const std::string& identifier) const override;
+  DeviceList GetDevices() override;
+  ConstDeviceList GetDevices() const override;
 
   // BluetoothDiscoveryManagerMac::Observer overrides:
   void ClassicDeviceFound(IOBluetoothDevice* device) override;

device/bluetooth/bluetooth_adapter_mac.mm

diff --git a/device/bluetooth/bluetooth_adapter_mac.mm b/device/bluetooth/bluetooth_adapter_mac.mm
index 77a0201..3f7dce0 100644
--- a/device/bluetooth/bluetooth_adapter_mac.mm
+++ b/device/bluetooth/bluetooth_adapter_mac.mm
@@ -329,6 +329,16 @@
   return nullptr;
 }
 
+BluetoothAdapter::DeviceList BluetoothAdapterMac::GetDevices() {
+  LazyInitialize();
+  return BluetoothAdapter::GetDevices();
+}
+
+BluetoothAdapter::ConstDeviceList BluetoothAdapterMac::GetDevices() const {
+  const_cast<BluetoothAdapterMac*>(this)->LazyInitialize();
+  return BluetoothAdapter::GetDevices();
+}
+
 void BluetoothAdapterMac::ClassicDeviceFound(IOBluetoothDevice* device) {
   ClassicDeviceAdded(device);
 }

extensions/common/extension.cc

diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc
index 2d483159..fdbb6d7 100644
--- a/extensions/common/extension.cc
+++ b/extensions/common/extension.cc
@@ -600,10 +600,8 @@
   // Check for |converted_from_user_script| first, since it affects the type
   // returned by GetType(). This is needed to determine if the manifest version
   // is valid.
-  if (manifest_->FindKey(keys::kConvertedFromUserScript)) {
-    manifest_->GetBoolean(keys::kConvertedFromUserScript,
-                          &converted_from_user_script_);
-  }
+  converted_from_user_script_ =
+      manifest_->FindBoolPath(keys::kConvertedFromUserScript).value_or(false);
 
   // Important to load manifest version first because many other features
   // depend on its value.
@@ -691,17 +689,20 @@
                   errors::kInvalidWebURLs, errors::kInvalidWebURL, error)) {
     return false;
   }
-  if (manifest_->FindKey(keys::kDisplayInLauncher) &&
-      !manifest_->GetBoolean(keys::kDisplayInLauncher, &display_in_launcher_)) {
-    *error = errors::kInvalidDisplayInLauncher;
-    return false;
+  if (const base::Value* temp = manifest_->FindKey(keys::kDisplayInLauncher)) {
+    if (!temp->is_bool()) {
+      *error = errors::kInvalidDisplayInLauncher;
+      return false;
+    }
+    display_in_launcher_ = temp->GetBool();
   }
-  if (manifest_->FindKey(keys::kDisplayInNewTabPage)) {
-    if (!manifest_->GetBoolean(keys::kDisplayInNewTabPage,
-                               &display_in_new_tab_page_)) {
+  if (const base::Value* temp =
+          manifest_->FindKey(keys::kDisplayInNewTabPage)) {
+    if (!temp->is_bool()) {
       *error = errors::kInvalidDisplayInNewTabPage;
       return false;
     }
+    display_in_new_tab_page_ = temp->GetBool();
   } else {
     // Inherit default from display_in_launcher property.
     display_in_new_tab_page_ = display_in_launcher_;
@@ -799,15 +800,15 @@
 bool Extension::LoadManifestVersion(std::u16string* error) {
   // Get the original value out of the dictionary so that we can validate it
   // more strictly.
-  bool key_exists =
-      manifest_->available_values().HasKey(keys::kManifestVersion);
-  if (key_exists) {
-    int manifest_version = 1;
-    if (!manifest_->GetInteger(keys::kManifestVersion, &manifest_version)) {
+  bool key_exists = false;
+  if (const base::Value* version_value =
+          manifest_->available_values().FindKey(keys::kManifestVersion)) {
+    if (!version_value->is_int()) {
       *error = InvalidManifestVersionError(
           errors::kInvalidManifestVersionUnsupported, is_platform_app());
       return false;
     }
+    key_exists = true;
   }
 
   manifest_version_ = manifest_->manifest_version();

extensions/common/manifest.cc

diff --git a/extensions/common/manifest.cc b/extensions/common/manifest.cc
index a44b449..0451f04 100644
--- a/extensions/common/manifest.cc
+++ b/extensions/common/manifest.cc
@@ -329,20 +329,12 @@
   return available_values_->FindPath(path);
 }
 
-bool Manifest::GetBoolean(
-    const std::string& path, bool* out_value) const {
-  absl::optional<bool> value = available_values_->FindBoolPath(path);
-  if (value)
-    *out_value = *value;
-  return value.has_value();
+absl::optional<bool> Manifest::FindBoolPath(base::StringPiece path) const {
+  return available_values_->FindBoolPath(path);
 }
 
-bool Manifest::GetInteger(
-    const std::string& path, int* out_value) const {
-  absl::optional<int> value = available_values_->FindIntPath(path);
-  if (value)
-    *out_value = *value;
-  return value.has_value();
+absl::optional<int> Manifest::FindIntPath(base::StringPiece path) const {
+  return available_values_->FindIntPath(path);
 }
 
 bool Manifest::GetString(

extensions/common/manifest.h

diff --git a/extensions/common/manifest.h b/extensions/common/manifest.h
index 4bc70c3..8eefa8d4 100644
--- a/extensions/common/manifest.h
+++ b/extensions/common/manifest.h
@@ -168,14 +168,14 @@
     return type_ == TYPE_CHROMEOS_SYSTEM_EXTENSION;
   }
 
-  // These access the wrapped manifest value, returning nullptr when the
+  // These access the wrapped manifest value, returning nullptr/nullopt when the
   // property does not exist or if the manifest type can't access it.
   const base::Value* FindKey(base::StringPiece path) const;
   const base::Value* FindPath(base::StringPiece path) const;
+  absl::optional<bool> FindBoolPath(base::StringPiece path) const;
+  absl::optional<int> FindIntPath(base::StringPiece path) const;
   // TODO(crbug/1187061): Update these methods to use non-deprecated
   // base::Value methods.
-  bool GetBoolean(const std::string& path, bool* out_value) const;
-  bool GetInteger(const std::string& path, int* out_value) const;
   bool GetString(const std::string& path, std::string* out_value) const;
   bool GetString(const std::string& path, std::u16string* out_value) const;
   // Deprecated: Use the GetDictionary() overload that accepts a base::Value

extensions/common/manifest_handlers/background_info.cc

diff --git a/extensions/common/manifest_handlers/background_info.cc b/extensions/common/manifest_handlers/background_info.cc
index 317d83c..469444c 100644
--- a/extensions/common/manifest_handlers/background_info.cc
+++ b/extensions/common/manifest_handlers/background_info.cc
@@ -423,10 +423,8 @@
   if (extension->is_platform_app()) {
     const std::string manifest_key =
         std::string(keys::kPlatformAppBackground) + ".persistent";
-    bool is_persistent = false;
     // Validate that packaged apps do not use a persistent background page.
-    if (extension->manifest()->GetBoolean(manifest_key, &is_persistent) &&
-        is_persistent) {
+    if (extension->manifest()->FindBoolPath(manifest_key).value_or(false)) {
       warnings->push_back(
           InstallWarning(errors::kInvalidBackgroundPersistentInPlatformApp));
     }

extensions/common/manifest_handlers/kiosk_mode_info.cc

diff --git a/extensions/common/manifest_handlers/kiosk_mode_info.cc b/extensions/common/manifest_handlers/kiosk_mode_info.cc
index b3e6004a..8a1c7c8 100644
--- a/extensions/common/manifest_handlers/kiosk_mode_info.cc
+++ b/extensions/common/manifest_handlers/kiosk_mode_info.cc
@@ -110,17 +110,21 @@
          manifest->FindKey(keys::kKioskOnly));
 
   bool kiosk_enabled = false;
-  if (manifest->FindKey(keys::kKioskEnabled) &&
-      !manifest->GetBoolean(keys::kKioskEnabled, &kiosk_enabled)) {
-    *error = manifest_errors::kInvalidKioskEnabled;
-    return false;
+  if (const base::Value* temp = manifest->FindKey(keys::kKioskEnabled)) {
+    if (!temp->is_bool()) {
+      *error = manifest_errors::kInvalidKioskEnabled;
+      return false;
+    }
+    kiosk_enabled = temp->GetBool();
   }
 
   bool kiosk_only = false;
-  if (manifest->FindKey(keys::kKioskOnly) &&
-      !manifest->GetBoolean(keys::kKioskOnly, &kiosk_only)) {
-    *error = manifest_errors::kInvalidKioskOnly;
-    return false;
+  if (const base::Value* temp = manifest->FindKey(keys::kKioskOnly)) {
+    if (!temp->is_bool()) {
+      *error = manifest_errors::kInvalidKioskOnly;
+      return false;
+    }
+    kiosk_only = temp->GetBool();
   }
 
   if (kiosk_only && !kiosk_enabled) {
@@ -187,10 +191,12 @@
 
   // Optional kiosk.always_update key.
   bool always_update = false;
-  if (manifest->FindPath(keys::kKioskAlwaysUpdate) &&
-      !manifest->GetBoolean(keys::kKioskAlwaysUpdate, &always_update)) {
-    *error = manifest_errors::kInvalidKioskAlwaysUpdate;
-    return false;
+  if (const base::Value* temp = manifest->FindPath(keys::kKioskAlwaysUpdate)) {
+    if (!temp->is_bool()) {
+      *error = manifest_errors::kInvalidKioskAlwaysUpdate;
+      return false;
+    }
+    always_update = temp->GetBool();
   }
 
   extension->SetManifestData(keys::kKioskMode,

extensions/common/manifest_handlers/offline_enabled_info.cc

diff --git a/extensions/common/manifest_handlers/offline_enabled_info.cc b/extensions/common/manifest_handlers/offline_enabled_info.cc
index 3b5dc2d0..d01ab24 100644
--- a/extensions/common/manifest_handlers/offline_enabled_info.cc
+++ b/extensions/common/manifest_handlers/offline_enabled_info.cc
@@ -39,7 +39,9 @@
 }
 
 bool OfflineEnabledHandler::Parse(Extension* extension, std::u16string* error) {
-  if (!extension->manifest()->FindKey(keys::kOfflineEnabled)) {
+  const base::Value* offline_enabled_value =
+      extension->manifest()->FindKey(keys::kOfflineEnabled);
+  if (offline_enabled_value == nullptr) {
     // Only platform apps are provided with a default offline enabled value.
     // A platform app is offline enabled unless it requests the webview
     // permission. That is, offline_enabled is true when there is NO webview
@@ -54,13 +56,11 @@
     return true;
   }
 
-  bool offline_enabled = false;
-
-  if (!extension->manifest()->GetBoolean(keys::kOfflineEnabled,
-                                         &offline_enabled)) {
+  if (!offline_enabled_value->is_bool()) {
     *error = manifest_errors::kInvalidOfflineEnabled;
     return false;
   }
+  bool offline_enabled = offline_enabled_value->GetBool();
 
   extension->SetManifestData(
       keys::kOfflineEnabled,

gpu/command_buffer/client/raster_implementation.cc

diff --git a/gpu/command_buffer/client/raster_implementation.cc b/gpu/command_buffer/client/raster_implementation.cc
index fbb8dbd..b8a8c2a 100644
--- a/gpu/command_buffer/client/raster_implementation.cc
+++ b/gpu/command_buffer/client/raster_implementation.cc
@@ -1260,6 +1260,7 @@
                                        GLuint row_bytes,
                                        const SkImageInfo& src_info,
                                        const void* src_pixels) {
+  TRACE_EVENT0("gpu", "RasterImplementation::WritePixels");
   DCHECK_GE(row_bytes, src_info.minRowBytes());
 
   // Get the size of the SkColorSpace while maintaining 8-byte alignment.
@@ -1540,6 +1541,7 @@
 
 void RasterImplementation::OnAsyncARGBReadbackDone(
     AsyncARGBReadbackRequest* finished_request) {
+  TRACE_EVENT0("gpu", "RasterImplementation::OnAsyncARGBReadbackDone");
   finished_request->done = true;
 
   // Only process requests in the order they were sent, regardless of when they
@@ -1593,6 +1595,7 @@
     GLuint dst_row_bytes,
     unsigned char* out,
     base::OnceCallback<void(GrSurfaceOrigin, bool)> readback_done) {
+  TRACE_EVENT0("gpu", "RasterImplementation::ReadbackARGBPixelsAsync");
   DCHECK(!!readback_done);
   // Note: It's possible the GL implementation supports other readback
   // types. However, as of this writing, no caller of this method will
@@ -1616,6 +1619,7 @@
     int src_x,
     int src_y,
     void* dst_pixels) {
+  TRACE_EVENT0("gpu", "RasterImplementation::ReadbackImagePixels");
   ReadbackImagePixelsINTERNAL(
       source_mailbox, dst_info, dst_row_bytes, src_x, src_y,
       base::OnceCallback<void(GrSurfaceOrigin, bool)>(), dst_pixels);
@@ -1636,6 +1640,7 @@
     const gfx::Point& paste_location,
     base::OnceCallback<void()> release_mailbox,
     base::OnceCallback<void(bool)> readback_done) {
+  TRACE_EVENT0("gpu", "RasterImplementation::ReadbackYUVPixelsAsync");
   DCHECK(!!release_mailbox);
   DCHECK(!!readback_done);
 
@@ -1724,6 +1729,7 @@
 
 void RasterImplementation::OnAsyncYUVReadbackDone(
     AsyncYUVReadbackRequest* finished_request) {
+  TRACE_EVENT0("gpu", "RasterImplementation::OnAsyncYUVReadbackDone");
   finished_request->done = true;
 
   while (!yuv_request_queue_.empty()) {

gpu/command_buffer/service/raster_decoder.cc

diff --git a/gpu/command_buffer/service/raster_decoder.cc b/gpu/command_buffer/service/raster_decoder.cc
index 0205d95..4408f06 100644
--- a/gpu/command_buffer/service/raster_decoder.cc
+++ b/gpu/command_buffer/service/raster_decoder.cc
@@ -2640,6 +2640,7 @@
                                               GLuint shm_offset,
                                               GLuint pixels_offset,
                                               const volatile GLbyte* mailbox) {
+  TRACE_EVENT0("gpu", "RasterDecoderImpl::DoWritePixelsINTERNAL");
   if (src_sk_color_type > kLastEnum_SkColorType) {
     LOCAL_SET_GL_ERROR(GL_INVALID_ENUM, "WritePixels",
                        "src_sk_color_type must be a valid SkColorType");
@@ -2819,6 +2820,7 @@
     GLuint color_space_offset,
     GLuint pixels_offset,
     const volatile GLbyte* mailbox) {
+  TRACE_EVENT0("gpu", "RasterDecoderImpl::DoReadbackARGBImagePixelsINTERNAL");
   if (dst_sk_color_type > kLastEnum_SkColorType) {
     LOCAL_SET_GL_ERROR(GL_INVALID_ENUM, "ReadbackImagePixels",
                        "dst_sk_color_type must be a valid SkColorType");
@@ -2981,6 +2983,7 @@
     GLuint v_offset,
     GLuint v_stride,
     const volatile GLbyte* mailbox) {
+  TRACE_EVENT0("gpu", "RasterDecoderImpl::DoReadbackYUVImagePixelsINTERNAL");
   if (dst_width % 2 != 0 || dst_height % 2 != 0) {
     LOCAL_SET_GL_ERROR(GL_INVALID_VALUE, "glReadbackImagePixels",
                        "|dst_width| and |dst_height| must be divisible by 2");

gpu/command_buffer/service/shared_image_backing_ozone.cc

diff --git a/gpu/command_buffer/service/shared_image_backing_ozone.cc b/gpu/command_buffer/service/shared_image_backing_ozone.cc
index b23b516..bfa87bc 100644
--- a/gpu/command_buffer/service/shared_image_backing_ozone.cc
+++ b/gpu/command_buffer/service/shared_image_backing_ozone.cc
@@ -203,7 +203,7 @@
   gfx::BufferFormat buffer_format = viz::BufferFormat(format());
   auto image = base::MakeRefCounted<gl::GLImageNativePixmap>(
       pixmap_->GetBufferSize(), buffer_format);
-  image->Initialize(std::move(pixmap_));
+  image->Initialize(pixmap_);
   return std::make_unique<SharedImageRepresentationOverlayOzone>(
       manager, this, tracker, image);
 }

infra/config/generated/builders/try/linux-rel-reclient/properties.textpb

diff --git a/infra/config/generated/builders/try/linux-rel-reclient/properties.textpb b/infra/config/generated/builders/try/linux-rel-reclient/properties.textpb
deleted file mode 100644
index 481ad39f..0000000
--- a/infra/config/generated/builders/try/linux-rel-reclient/properties.textpb
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "$build/code_coverage": {
-    "use_clang_coverage": true
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-gvisor-shadow",
-    "jobs": 150,
-    "metrics_project": "chromium-reclient-metrics"
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium.linux",
-  "recipe": "chromium_trybot"
-}
\ No newline at end of file

infra/config/generated/cq-builders.md

diff --git a/infra/config/generated/cq-builders.md b/infra/config/generated/cq-builders.md
index ddfa3f17..4a3de488 100644
--- a/infra/config/generated/cq-builders.md
+++ b/infra/config/generated/cq-builders.md
@@ -470,9 +470,6 @@
   * [`//content/browser/tracing/.+`](https://cs.chromium.org/chromium/src/content/browser/tracing/)
   * [`//services/tracing/.+`](https://cs.chromium.org/chromium/src/services/tracing/)
 
-* [linux-rel-reclient](https://ci.chromium.org/p/chromium/builders/try/linux-rel-reclient) ([definition](https://cs.chromium.org/search?q=+file:/try.star$+""linux-rel-reclient"")) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+""linux-rel-reclient""))
-  * Experiment percentage: 10.0
-
 * [linux-rel-rts](https://ci.chromium.org/p/chromium/builders/try/linux-rel-rts) ([definition](https://cs.chromium.org/search?q=+file:/try.star$+""linux-rel-rts"")) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+""linux-rel-rts""))
   * Experiment percentage: 5.0
 

infra/config/generated/luci/commit-queue.cfg

diff --git a/infra/config/generated/luci/commit-queue.cfg b/infra/config/generated/luci/commit-queue.cfg
index 27793a2..5c93205 100644
--- a/infra/config/generated/luci/commit-queue.cfg
+++ b/infra/config/generated/luci/commit-queue.cfg
@@ -1385,13 +1385,6 @@
         includable_only: true
       }
       builders {
-        name: "chromium/try/linux-rel-reclient"
-        experiment_percentage: 10
-        location_regexp: ".*"
-        location_regexp_exclude: ".+/[+]/docs/.+"
-        location_regexp_exclude: ".+/[+]/infra/config/.+"
-      }
-      builders {
         name: "chromium/try/linux-rel-rts"
         experiment_percentage: 5
         location_regexp: ".*"

infra/config/generated/luci/cr-buildbucket.cfg

diff --git a/infra/config/generated/luci/cr-buildbucket.cfg b/infra/config/generated/luci/cr-buildbucket.cfg
index 857574b..5eb3b092 100644
--- a/infra/config/generated/luci/cr-buildbucket.cfg
+++ b/infra/config/generated/luci/cr-buildbucket.cfg
@@ -67781,95 +67781,6 @@
       description_html: "This is the compilator half of an orchestrator + compilator pair of builders. The orchestrator is <a href=\"https://ci.chromium.org/p/chromium/builders/try/linux-rel\">linux-rel</a>."
     }
     builders {
-      name: "linux-rel-reclient"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-18.04"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/code_coverage": {'
-        '    "use_clang_coverage": true'
-        '  },'
-        '  "$build/reclient": {'
-        '    "instance": "rbe-chromium-gvisor-shadow",'
-        '    "jobs": 150,'
-        '    "metrics_project": "chromium-reclient-metrics"'
-        '  },'
-        '  "$recipe_engine/resultdb/test_presentation": {'
-        '    "column_keys": [],'
-        '    "grouping_keys": ['
-        '      "status",'
-        '      "v.test_suite"'
-        '    ]'
-        '  },'
-        '  "builder_group": "tryserver.chromium.linux",'
-        '  "recipe": "chromium_trybot"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      caches {
-        name: "win_toolchain"
-        path: "win_toolchain"
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 25
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://[^/]*blink_web_tests/.+"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
       name: "linux-rel-rts"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "builder:linux-rel-rts"

infra/config/generated/luci/luci-milo.cfg

diff --git a/infra/config/generated/luci/luci-milo.cfg b/infra/config/generated/luci/luci-milo.cfg
index 211659b..08d3598 100644
--- a/infra/config/generated/luci/luci-milo.cfg
+++ b/infra/config/generated/luci/luci-milo.cfg
@@ -2499,9 +2499,6 @@
     name: "buildbucket/luci.chromium.try/linux-rel-compilator"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/linux-rel-reclient"
-  }
-  builders {
     name: "buildbucket/luci.chromium.try/linux-wayland-rel"
   }
   builders {
@@ -14601,9 +14598,6 @@
     name: "buildbucket/luci.chromium.try/linux-rel-compilator"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/linux-rel-reclient"
-  }
-  builders {
     name: "buildbucket/luci.chromium.try/linux-rel-rts"
   }
   builders {
@@ -15644,9 +15638,6 @@
     name: "buildbucket/luci.chromium.try/linux-rel-compilator"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/linux-rel-reclient"
-  }
-  builders {
     name: "buildbucket/luci.chromium.try/linux-rel-rts"
   }
   builders {

infra/config/generated/luci/project.cfg

diff --git a/infra/config/generated/luci/project.cfg b/infra/config/generated/luci/project.cfg
index 5e2b35df..9f7b01980 100644
--- a/infra/config/generated/luci/project.cfg
+++ b/infra/config/generated/luci/project.cfg
@@ -7,7 +7,7 @@
 name: "chromium"
 access: "group:all"
 lucicfg {
-  version: "1.30.5"
+  version: "1.30.4"
   package_dir: "../.."
   config_dir: "generated/luci"
   entry_point: "main.star"

infra/config/subprojects/chromium/try.star

diff --git a/infra/config/subprojects/chromium/try.star b/infra/config/subprojects/chromium/try.star
index cdb75df..730dbba 100644
--- a/infra/config/subprojects/chromium/try.star
+++ b/infra/config/subprojects/chromium/try.star
@@ -1374,19 +1374,6 @@
 )
 
 try_.chromium_linux_builder(
-    name = "linux-rel-reclient",
-    branch_selector = branches.STANDARD_MILESTONE,
-    main_list_view = "try",
-    reclient_jobs = 150,
-    goma_backend = None,
-    reclient_instance = "rbe-chromium-gvisor-shadow",
-    tryjob = try_.job(
-        experiment_percentage = 10,
-    ),
-    use_clang_coverage = True,
-)
-
-try_.chromium_linux_builder(
     name = "linux-wayland-rel",
     branch_selector = branches.STANDARD_MILESTONE,
     builderless = not settings.is_main,

ios/chrome/browser/ui/autofill/manual_fill/manual_fill_credit_card+CreditCard.mm

diff --git a/ios/chrome/browser/ui/autofill/manual_fill/manual_fill_credit_card+CreditCard.mm b/ios/chrome/browser/ui/autofill/manual_fill/manual_fill_credit_card+CreditCard.mm
index 0a34992..a1ad4a3d 100644
--- a/ios/chrome/browser/ui/autofill/manual_fill/manual_fill_credit_card+CreditCard.mm
+++ b/ios/chrome/browser/ui/autofill/manual_fill/manual_fill_credit_card+CreditCard.mm
@@ -40,10 +40,13 @@
   //  - 0x2060 - WORD-JOINER (makes string undivisible).
   constexpr char16_t separator[] = {0x2060, 0x0020, 0};
   const std::u16string digits = creditCard.LastFourDigits();
-  NSString* obfuscatedNumber = base::SysUTF16ToNSString(
-      autofill::kMidlineEllipsis4Dots + std::u16string(separator) +
-      autofill::kMidlineEllipsis4Dots + std::u16string(separator) +
-      autofill::kMidlineEllipsis4Dots + std::u16string(separator) + digits);
+  NSString* obfuscatedNumber =
+      base::SysUTF16ToNSString(autofill::CreditCard::GetMidlineEllipsisDots(4) +
+                               std::u16string(separator) +
+                               autofill::CreditCard::GetMidlineEllipsisDots(4) +
+                               std::u16string(separator) +
+                               autofill::CreditCard::GetMidlineEllipsisDots(4) +
+                               std::u16string(separator) + digits);
 
   // Use 2 digits year.
   NSString* expirationYear =

ios/chrome/browser/ui/content_suggestions/content_suggestions_collection_updater.h

diff --git a/ios/chrome/browser/ui/content_suggestions/content_suggestions_collection_updater.h b/ios/chrome/browser/ui/content_suggestions/content_suggestions_collection_updater.h
index 0d97910..02fc22b 100644
--- a/ios/chrome/browser/ui/content_suggestions/content_suggestions_collection_updater.h
+++ b/ios/chrome/browser/ui/content_suggestions/content_suggestions_collection_updater.h
@@ -50,11 +50,6 @@
 - (NSIndexSet*)addSectionsForSectionInfoToModel:
     (NSArray<ContentSuggestionsSectionInformation*>*)sectionsInfo;
 
-// Removes the empty item in the section corresponding to |sectionInfo| from the
-// model and returns its index path. Returns nil if there is no empty item.
-- (NSIndexPath*)removeEmptySuggestionsForSectionInfo:
-    (ContentSuggestionsSectionInformation*)sectionInfo;
-
 // Adds the |suggestions| to the model in the section corresponding to
 // |sectionInfo| and returns their index paths. The caller must ensure the
 // corresponding section has been added to the model.

ios/chrome/browser/ui/content_suggestions/content_suggestions_collection_updater.mm

diff --git a/ios/chrome/browser/ui/content_suggestions/content_suggestions_collection_updater.mm b/ios/chrome/browser/ui/content_suggestions/content_suggestions_collection_updater.mm
index 40ab44c..f448313 100644
--- a/ios/chrome/browser/ui/content_suggestions/content_suggestions_collection_updater.mm
+++ b/ios/chrome/browser/ui/content_suggestions/content_suggestions_collection_updater.mm
@@ -166,74 +166,6 @@
 
 #pragma mark - ContentSuggestionsDataSink
 
-- (void)dataAvailableForSection:
-            (ContentSuggestionsSectionInformation*)sectionInfo
-                    forceReload:(BOOL)forceReload {
-  SectionIdentifier sectionIdentifier = SectionIdentifierForInfo(sectionInfo);
-  CSCollectionViewModel* model =
-      self.collectionViewController.collectionViewModel;
-
-  if (forceReload && [model hasSectionForSectionIdentifier:sectionIdentifier]) {
-    NSInteger section = [model sectionForSectionIdentifier:sectionIdentifier];
-    NSInteger numberOfItems = [model numberOfItemsInSection:section];
-    NSMutableArray<NSIndexPath*>* indexesToDelete = [NSMutableArray array];
-    for (NSInteger i = 0; i < numberOfItems; i++) {
-      [indexesToDelete
-          addObject:[NSIndexPath indexPathForItem:i inSection:section]];
-    }
-
-    UICollectionView* collection = self.collectionViewController.collectionView;
-    // Delete all the items manually to avoid adding an empty item.
-    [collection performBatchUpdates:^{
-      [self.collectionViewController collectionView:collection
-                        willDeleteItemsAtIndexPaths:indexesToDelete];
-      [collection deleteItemsAtIndexPaths:indexesToDelete];
-    }
-                         completion:nil];
-  }
-
-  if ([model hasSectionForSectionIdentifier:sectionIdentifier]) {
-    NSArray<CSCollectionViewItem*>* items =
-        [model itemsInSectionWithIdentifier:sectionIdentifier];
-    if (items.count > 0 && items[0].type != ItemTypeEmpty) {
-      // Do not dismiss the presented items.
-      return;
-    }
-  }
-
-  [self.collectionViewController
-      addSuggestions:[self.dataSource itemsForSectionInfo:sectionInfo]
-       toSectionInfo:sectionInfo];
-}
-
-- (void)clearSuggestion:(ContentSuggestionIdentifier*)suggestionIdentifier {
-  SectionIdentifier sectionIdentifier =
-      SectionIdentifierForInfo(suggestionIdentifier.sectionInfo);
-  if (![self.collectionViewController.collectionViewModel
-          hasSectionForSectionIdentifier:sectionIdentifier]) {
-    return;
-  }
-
-  NSArray<CSCollectionViewItem*>* itemsInSection =
-      [self.collectionViewController.collectionViewModel
-          itemsInSectionWithIdentifier:sectionIdentifier];
-
-  CSCollectionViewItem* correspondingItem = nil;
-  for (CSCollectionViewItem* item in itemsInSection) {
-    if (item.suggestionIdentifier == suggestionIdentifier) {
-      correspondingItem = item;
-      break;
-    }
-  }
-
-  if (!correspondingItem)
-    return;
-
-  NSIndexPath* indexPath = [self.collectionViewController.collectionViewModel
-      indexPathForItem:correspondingItem];
-  [self.collectionViewController dismissEntryAtIndexPath:indexPath];
-}
-
 - (void)reloadAllData {
   [self resetModels];
 
@@ -292,63 +224,6 @@
   [self.collectionViewController dismissSection:section];
 }
 
-- (void)reloadSection:(ContentSuggestionsSectionInformation*)sectionInfo {
-  CSCollectionViewModel* model =
-      self.collectionViewController.collectionViewModel;
-  SectionIdentifier sectionIdentifier = SectionIdentifierForInfo(sectionInfo);
-
-  if (![model hasSectionForSectionIdentifier:sectionIdentifier]) {
-    [self.collectionViewController
-        addSuggestions:[self.dataSource itemsForSectionInfo:sectionInfo]
-         toSectionInfo:sectionInfo];
-    return;
-  }
-
-  NSInteger section = [model sectionForSectionIdentifier:sectionIdentifier];
-
-  // Reset collection model data for |sectionIdentifier|
-  [self.collectionViewController.collectionViewModel
-                     setFooter:nil
-      forSectionWithIdentifier:sectionIdentifier];
-  [self.collectionViewController.collectionViewModel
-                     setHeader:nil
-      forSectionWithIdentifier:sectionIdentifier];
-  [self.sectionIdentifiersFromContentSuggestions
-      removeObject:@(sectionIdentifier)];
-
-  // Update the section and the other ones.
-  auto addSectionBlock = ^{
-    [self.collectionViewController.collectionViewModel
-        removeSectionWithIdentifier:sectionIdentifier];
-    [self.collectionViewController.collectionView
-        deleteSections:[NSIndexSet indexSetWithIndex:section]];
-
-    NSIndexSet* addedSections =
-        [self addSectionsForSectionInfoToModel:@[ sectionInfo ]];
-    [self.collectionViewController.collectionView insertSections:addedSections];
-
-    NSArray<NSIndexPath*>* addedItems = [self
-        addSuggestionsToModel:[self.dataSource itemsForSectionInfo:sectionInfo]
-              withSectionInfo:sectionInfo];
-    [self.collectionViewController.collectionView
-        insertItemsAtIndexPaths:addedItems];
-  };
-  [UIView animateWithDuration:0
-                   animations:^{
-                     [self.collectionViewController.collectionView
-                         performBatchUpdates:addSectionBlock
-                                  completion:nil];
-                   }];
-
-  // Make sure the section is still in the model and that the index is correct.
-  if (![model hasSectionForSectionIdentifier:sectionIdentifier])
-    return;
-  section = [model sectionForSectionIdentifier:sectionIdentifier];
-
-  [self.collectionViewController.collectionView
-      reloadSections:[NSIndexSet indexSetWithIndex:section]];
-}
-
 - (void)itemHasChanged:(CollectionViewItem<SuggestedContent>*)item {
   if (![self.collectionViewController.collectionViewModel hasItem:item]) {
     return;
@@ -371,26 +246,6 @@
   return ContentSuggestionTypeForItemType(item.type);
 }
 
-- (NSIndexPath*)removeEmptySuggestionsForSectionInfo:
-    (ContentSuggestionsSectionInformation*)sectionInfo {
-  CSCollectionViewModel* model =
-      self.collectionViewController.collectionViewModel;
-  NSInteger sectionIdentifier = SectionIdentifierForInfo(sectionInfo);
-
-  if (![model hasSectionForSectionIdentifier:sectionIdentifier])
-    return nil;
-
-  NSArray<CSCollectionViewItem*>* existingItems =
-      [model itemsInSectionWithIdentifier:sectionIdentifier];
-  if (existingItems.count == 1 && existingItems[0].type == ItemTypeEmpty) {
-    [model removeItemWithType:ItemTypeEmpty
-        fromSectionWithIdentifier:sectionIdentifier];
-    NSInteger section = [model sectionForSectionIdentifier:sectionIdentifier];
-    return [NSIndexPath indexPathForItem:0 inSection:section];
-  }
-  return nil;
-}
-
 - (NSArray<NSIndexPath*>*)
 addSuggestionsToModel:(NSArray<CSCollectionViewItem*>*)suggestions
       withSectionInfo:(ContentSuggestionsSectionInformation*)sectionInfo {

ios/chrome/browser/ui/content_suggestions/content_suggestions_data_sink.h

diff --git a/ios/chrome/browser/ui/content_suggestions/content_suggestions_data_sink.h b/ios/chrome/browser/ui/content_suggestions/content_suggestions_data_sink.h
index b807deb..62229352 100644
--- a/ios/chrome/browser/ui/content_suggestions/content_suggestions_data_sink.h
+++ b/ios/chrome/browser/ui/content_suggestions/content_suggestions_data_sink.h
@@ -14,19 +14,6 @@
 // to be pulled.
 @protocol ContentSuggestionsDataSink
 
-// Notifies the Data Sink that new data is available for the section identified
-// by |sectionInfo|.
-// If |forceReload| is YES, the section is reloaded with the new suggestions.
-// If |forceReload| is NO, the new data are loaded only if the section is empty.
-- (void)dataAvailableForSection:
-            (ContentSuggestionsSectionInformation*)sectionInfo
-                    forceReload:(BOOL)forceReload;
-
-// The suggestion associated with |suggestionIdentifier| has been invalidated by
-// the backend data source and should be cleared now. This is why this method is
-// about the data source pushing something to the data sink.
-- (void)clearSuggestion:(ContentSuggestionIdentifier*)suggestionIdentifier;
-
 // Notifies the Data Sink that it must remove all current data and reload new
 // ones.
 - (void)reloadAllData;
@@ -42,10 +29,6 @@
 // something to the data sink.
 - (void)clearSection:(ContentSuggestionsSectionInformation*)sectionInfo;
 
-// The content of the section corresponding to |sectionInfo| must be reloaded
-// now, removing the current content.
-- (void)reloadSection:(ContentSuggestionsSectionInformation*)sectionInfo;
-
 // Notifies the data sink that the |item| has changed.
 - (void)itemHasChanged:(CollectionViewItem<SuggestedContent>*)item;
 

ios/chrome/browser/ui/content_suggestions/content_suggestions_view_controller.h

diff --git a/ios/chrome/browser/ui/content_suggestions/content_suggestions_view_controller.h b/ios/chrome/browser/ui/content_suggestions/content_suggestions_view_controller.h
index 1c62b6b4..b406ab0 100644
--- a/ios/chrome/browser/ui/content_suggestions/content_suggestions_view_controller.h
+++ b/ios/chrome/browser/ui/content_suggestions/content_suggestions_view_controller.h
@@ -59,11 +59,6 @@
 - (void)dismissEntryAtIndexPath:(NSIndexPath*)indexPath;
 // Removes the |section|.
 - (void)dismissSection:(NSInteger)section;
-// Adds the |suggestions| to the collection and its model in the section
-// corresponding to |sectionInfo|.
-- (void)addSuggestions:
-            (NSArray<CollectionViewItem<SuggestedContent>*>*)suggestions
-         toSectionInfo:(ContentSuggestionsSectionInformation*)sectionInfo;
 
 @end
 

ios/chrome/browser/ui/content_suggestions/content_suggestions_view_controller.mm

diff --git a/ios/chrome/browser/ui/content_suggestions/content_suggestions_view_controller.mm b/ios/chrome/browser/ui/content_suggestions/content_suggestions_view_controller.mm
index bb3b246..ca086bc 100644
--- a/ios/chrome/browser/ui/content_suggestions/content_suggestions_view_controller.mm
+++ b/ios/chrome/browser/ui/content_suggestions/content_suggestions_view_controller.mm
@@ -120,28 +120,6 @@
       }];
 }
 
-- (void)addSuggestions:(NSArray<CSCollectionViewItem*>*)suggestions
-         toSectionInfo:(ContentSuggestionsSectionInformation*)sectionInfo {
-  void (^batchUpdates)(void) = ^{
-    NSIndexSet* addedSections = [self.collectionUpdater
-        addSectionsForSectionInfoToModel:@[ sectionInfo ]];
-    [self.collectionView insertSections:addedSections];
-
-    NSIndexPath* removedItem = [self.collectionUpdater
-        removeEmptySuggestionsForSectionInfo:sectionInfo];
-    if (removedItem) {
-      [self.collectionView deleteItemsAtIndexPaths:@[ removedItem ]];
-    }
-
-    NSArray<NSIndexPath*>* addedItems =
-        [self.collectionUpdater addSuggestionsToModel:suggestions
-                                      withSectionInfo:sectionInfo];
-    [self.collectionView insertItemsAtIndexPaths:addedItems];
-  };
-
-  [self.collectionView performBatchUpdates:batchUpdates completion:nil];
-}
-
 #pragma mark - UIViewController
 
 - (void)viewDidLoad {
@@ -163,14 +141,6 @@
 
   ApplyVisualConstraints(@[ @"V:|[collection]|", @"H:|[collection]|" ],
                          @{@"collection" : self.collectionView});
-
-    UILongPressGestureRecognizer* longPressRecognizer =
-        [[UILongPressGestureRecognizer alloc]
-            initWithTarget:self
-                    action:@selector(handleLongPress:)];
-    longPressRecognizer.delegate = self;
-    [self.collectionView addGestureRecognizer:longPressRecognizer];
-
 }
 
 - (void)viewDidAppear:(BOOL)animated {
@@ -299,14 +269,6 @@
     if ([self.collectionUpdater isMostVisitedSection:section]) {
       parentInset.bottom = kMostVisitedBottomMargin;
     }
-  } else if (self.styler.cellStyle == MDCCollectionViewCellStyleCard) {
-    CGFloat collectionWidth = collectionView.bounds.size.width;
-    CGFloat maxCardWidth = content_suggestions::searchFieldWidth(
-        collectionWidth, self.traitCollection);
-    CGFloat margin =
-        MAX(0, (collectionView.frame.size.width - maxCardWidth) / 2);
-    parentInset.left = margin;
-    parentInset.right = margin;
   }
   return parentInset;
 }
@@ -428,34 +390,6 @@
 
 #pragma mark - Private
 
-- (void)handleLongPress:(UILongPressGestureRecognizer*)gestureRecognizer {
-  if (self.editor.editing ||
-      gestureRecognizer.state != UIGestureRecognizerStateBegan) {
-    return;
-  }
-
-  CGPoint touchLocation =
-      [gestureRecognizer locationOfTouch:0 inView:self.collectionView];
-  NSIndexPath* touchedItemIndexPath =
-      [self.collectionView indexPathForItemAtPoint:touchLocation];
-  if (!touchedItemIndexPath ||
-      ![self.collectionViewModel hasItemAtIndexPath:touchedItemIndexPath]) {
-    // Make sure there is an item at this position.
-    return;
-  }
-  CollectionViewItem* touchedItem =
-      [self.collectionViewModel itemAtIndexPath:touchedItemIndexPath];
-
-  ContentSuggestionType type =
-      [self.collectionUpdater contentSuggestionTypeForItem:touchedItem];
-  switch (type) {
-    case ContentSuggestionTypeMostVisited:
-      break;
-    default:
-      break;
-  }
-}
-
 // Checks if the |section| is empty and add an empty element if it is the case.
 // Must be called from inside a performBatchUpdates: block.
 - (void)addEmptySectionPlaceholderIfNeeded:(NSInteger)section {

ios/public/provider/chrome/browser/discover_feed/discover_feed_provider.h

diff --git a/ios/public/provider/chrome/browser/discover_feed/discover_feed_provider.h b/ios/public/provider/chrome/browser/discover_feed/discover_feed_provider.h
index 25a79b5..4b08c08 100644
--- a/ios/public/provider/chrome/browser/discover_feed/discover_feed_provider.h
+++ b/ios/public/provider/chrome/browser/discover_feed/discover_feed_provider.h
@@ -43,11 +43,22 @@
   // Returns true if the Discover Feed is enabled.
   virtual bool IsDiscoverFeedEnabled();
   // Returns the Discover Feed ViewController.
+  // TODO(crbug.com/1200303): Remove this now that refactored NTP has launched.
   virtual UIViewController* NewFeedViewController(Browser* browser);
   // Returns the Discover Feed ViewController with a custom
   // DiscoverFeedViewControllerConfiguration.
+  // TODO(crbug.com/1277974): Deprecated, use
+  // NewDiscoverFeedViewControllerWithConfiguration instead.
   virtual UIViewController* NewFeedViewControllerWithConfiguration(
       DiscoverFeedViewControllerConfiguration* configuration);
+  // Returns the Discover Feed ViewController with a custom
+  // DiscoverFeedViewControllerConfiguration.
+  virtual UIViewController* NewDiscoverFeedViewControllerWithConfiguration(
+      DiscoverFeedViewControllerConfiguration* configuration);
+  // Returns the Following Feed ViewController with a custom
+  // DiscoverFeedViewControllerConfiguration.
+  virtual UIViewController* NewFollowingFeedViewControllerWithConfiguration(
+      DiscoverFeedViewControllerConfiguration* configuration);
   // Removes the Discover |feedViewController|. It should be called whenever
   // |feedViewController| will no longer be used.
   virtual void RemoveFeedViewController(UIViewController* feedViewController);

ios/public/provider/chrome/browser/discover_feed/discover_feed_provider.mm

diff --git a/ios/public/provider/chrome/browser/discover_feed/discover_feed_provider.mm b/ios/public/provider/chrome/browser/discover_feed/discover_feed_provider.mm
index 3821680..4955285 100644
--- a/ios/public/provider/chrome/browser/discover_feed/discover_feed_provider.mm
+++ b/ios/public/provider/chrome/browser/discover_feed/discover_feed_provider.mm
@@ -27,6 +27,18 @@
   return nil;
 }
 
+UIViewController*
+DiscoverFeedProvider::NewDiscoverFeedViewControllerWithConfiguration(
+    DiscoverFeedViewControllerConfiguration* configuration) {
+  return nil;
+}
+
+UIViewController*
+DiscoverFeedProvider::NewFollowingFeedViewControllerWithConfiguration(
+    DiscoverFeedViewControllerConfiguration* configuration) {
+  return nil;
+}
+
 void DiscoverFeedProvider::RemoveFeedViewController(
     UIViewController* feedViewController) {}
 

media/gpu/v4l2/test/vp9_decoder.cc

diff --git a/media/gpu/v4l2/test/vp9_decoder.cc b/media/gpu/v4l2/test/vp9_decoder.cc
index dd942f0c..f50e2f19 100644
--- a/media/gpu/v4l2/test/vp9_decoder.cc
+++ b/media/gpu/v4l2/test/vp9_decoder.cc
@@ -271,6 +271,106 @@
   }
 }
 
+void Vp9Decoder::SetupFrameParams(
+    const Vp9FrameHeader& frame_hdr,
+    struct v4l2_ctrl_vp9_frame_decode_params* v4l2_frame_params) {
+  conditionally_set_flag(*v4l2_frame_params,
+                         frame_hdr.frame_type == Vp9FrameHeader::KEYFRAME,
+                         V4L2_VP9_FRAME_FLAG_KEY_FRAME);
+  conditionally_set_flag(*v4l2_frame_params, frame_hdr.show_frame,
+                         V4L2_VP9_FRAME_FLAG_SHOW_FRAME);
+  conditionally_set_flag(*v4l2_frame_params, frame_hdr.error_resilient_mode,
+                         V4L2_VP9_FRAME_FLAG_ERROR_RESILIENT);
+  conditionally_set_flag(*v4l2_frame_params, frame_hdr.intra_only,
+                         V4L2_VP9_FRAME_FLAG_INTRA_ONLY);
+  conditionally_set_flag(*v4l2_frame_params, frame_hdr.allow_high_precision_mv,
+                         V4L2_VP9_FRAME_FLAG_ALLOW_HIGH_PREC_MV);
+  conditionally_set_flag(*v4l2_frame_params, frame_hdr.refresh_frame_context,
+                         V4L2_VP9_FRAME_FLAG_REFRESH_FRAME_CTX);
+  conditionally_set_flag(*v4l2_frame_params,
+                         frame_hdr.frame_parallel_decoding_mode,
+                         V4L2_VP9_FRAME_FLAG_PARALLEL_DEC_MODE);
+  conditionally_set_flag(*v4l2_frame_params, frame_hdr.subsampling_x,
+                         V4L2_VP9_FRAME_FLAG_X_SUBSAMPLING);
+  conditionally_set_flag(*v4l2_frame_params, frame_hdr.subsampling_y,
+                         V4L2_VP9_FRAME_FLAG_Y_SUBSAMPLING);
+  conditionally_set_flag(*v4l2_frame_params, frame_hdr.color_range,
+                         V4L2_VP9_FRAME_FLAG_COLOR_RANGE_FULL_SWING);
+
+  v4l2_frame_params->compressed_header_size = frame_hdr.header_size_in_bytes;
+  v4l2_frame_params->uncompressed_header_size =
+      frame_hdr.uncompressed_header_size;
+  v4l2_frame_params->profile = frame_hdr.profile;
+  // As per the VP9 specification:
+  switch (frame_hdr.reset_frame_context) {
+    // "0 or 1 implies don’t reset."
+    case 0:
+    case 1:
+      v4l2_frame_params->reset_frame_context = V4L2_VP9_RESET_FRAME_CTX_NONE;
+      break;
+    // "2 resets just the context specified in the frame header."
+    case 2:
+      v4l2_frame_params->reset_frame_context = V4L2_VP9_RESET_FRAME_CTX_SPEC;
+      break;
+    // "3 reset all contexts."
+    case 3:
+      v4l2_frame_params->reset_frame_context = V4L2_VP9_RESET_FRAME_CTX_ALL;
+      break;
+    default:
+      LOG(FATAL) << "Invalid reset frame context value!";
+      v4l2_frame_params->reset_frame_context = V4L2_VP9_RESET_FRAME_CTX_NONE;
+      break;
+  }
+  v4l2_frame_params->frame_context_idx =
+      frame_hdr.frame_context_idx_to_save_probs;
+  v4l2_frame_params->bit_depth = frame_hdr.bit_depth;
+  v4l2_frame_params->interpolation_filter = frame_hdr.interpolation_filter;
+  v4l2_frame_params->tile_cols_log2 = frame_hdr.tile_cols_log2;
+  v4l2_frame_params->tile_rows_log2 = frame_hdr.tile_rows_log2;
+  v4l2_frame_params->tx_mode = frame_hdr.compressed_header.tx_mode;
+  v4l2_frame_params->reference_mode =
+      frame_hdr.compressed_header.reference_mode;
+  static_assert(VP9_FRAME_LAST + (V4L2_REF_ID_CNT - 1) <
+                    std::extent<decltype(frame_hdr.ref_frame_sign_bias)>::value,
+                "array sizes are incompatible");
+  for (size_t i = 0; i < V4L2_REF_ID_CNT; i++) {
+    v4l2_frame_params->ref_frame_sign_biases |=
+        (frame_hdr.ref_frame_sign_bias[i + VP9_FRAME_LAST] ? (1 << i) : 0);
+  }
+  v4l2_frame_params->frame_width_minus_1 = frame_hdr.frame_width - 1;
+  v4l2_frame_params->frame_height_minus_1 = frame_hdr.frame_height - 1;
+  v4l2_frame_params->render_width_minus_1 = frame_hdr.render_width - 1;
+  v4l2_frame_params->render_height_minus_1 = frame_hdr.render_height - 1;
+
+  constexpr uint64_t kInvalidSurface = std::numeric_limits<uint32_t>::max();
+
+  for (size_t i = 0; i < base::size(frame_hdr.ref_frame_idx); ++i) {
+    const auto idx = frame_hdr.ref_frame_idx[i];
+
+    LOG_ASSERT(idx < kVp9NumRefFrames) << "Invalid reference frame index.\n";
+
+    static_assert(
+        std::extent<decltype(frame_hdr.ref_frame_idx)>::value ==
+            std::extent<decltype(v4l2_frame_params->refs)>::value,
+        "The number of reference frames in |Vp9FrameHeader| does not match "
+        "|v4l2_ctrl_vp9_frame_decode_params|. Fix |Vp9FrameHeader|.");
+
+    v4l2_frame_params->refs[i] =
+        ref_frames_[idx] ? ref_frames_[idx]->reference_id() : kInvalidSurface;
+  }
+  // TODO(stevecho): fill in the rest of |v4l2_frame_params| fields.
+  FillV4L2VP9QuantizationParams(frame_hdr.quant_params,
+                                &v4l2_frame_params->quant);
+  FillV4L2VP9ProbsParams(frame_hdr.frame_context, &v4l2_frame_params->probs);
+
+  const Vp9Parser::Context& context = vp9_parser_->context();
+  const Vp9LoopFilterParams& lf_params = context.loop_filter();
+  const Vp9SegmentationParams& segm_params = context.segmentation();
+
+  FillV4L2VP9LoopFilterParams(lf_params, &v4l2_frame_params->lf);
+  FillV4L2VP9SegmentationParams(segm_params, &v4l2_frame_params->seg);
+}
+
 Vp9Decoder::Result Vp9Decoder::DecodeNextFrame() {
   gfx::Size size;
   Vp9FrameHeader frame_hdr{};
@@ -295,100 +395,7 @@
   struct v4l2_ctrl_vp9_frame_decode_params v4l2_frame_params;
   memset(&v4l2_frame_params, 0, sizeof(v4l2_frame_params));
 
-  conditionally_set_flag(v4l2_frame_params,
-                         frame_hdr.frame_type == Vp9FrameHeader::KEYFRAME,
-                         V4L2_VP9_FRAME_FLAG_KEY_FRAME);
-  conditionally_set_flag(v4l2_frame_params, frame_hdr.show_frame,
-                         V4L2_VP9_FRAME_FLAG_SHOW_FRAME);
-  conditionally_set_flag(v4l2_frame_params, frame_hdr.error_resilient_mode,
-                         V4L2_VP9_FRAME_FLAG_ERROR_RESILIENT);
-  conditionally_set_flag(v4l2_frame_params, frame_hdr.intra_only,
-                         V4L2_VP9_FRAME_FLAG_INTRA_ONLY);
-  conditionally_set_flag(v4l2_frame_params, frame_hdr.allow_high_precision_mv,
-                         V4L2_VP9_FRAME_FLAG_ALLOW_HIGH_PREC_MV);
-  conditionally_set_flag(v4l2_frame_params, frame_hdr.refresh_frame_context,
-                         V4L2_VP9_FRAME_FLAG_REFRESH_FRAME_CTX);
-  conditionally_set_flag(v4l2_frame_params,
-                         frame_hdr.frame_parallel_decoding_mode,
-                         V4L2_VP9_FRAME_FLAG_PARALLEL_DEC_MODE);
-  conditionally_set_flag(v4l2_frame_params, frame_hdr.subsampling_x,
-                         V4L2_VP9_FRAME_FLAG_X_SUBSAMPLING);
-  conditionally_set_flag(v4l2_frame_params, frame_hdr.subsampling_y,
-                         V4L2_VP9_FRAME_FLAG_Y_SUBSAMPLING);
-  conditionally_set_flag(v4l2_frame_params, frame_hdr.color_range,
-                         V4L2_VP9_FRAME_FLAG_COLOR_RANGE_FULL_SWING);
-
-  v4l2_frame_params.compressed_header_size = frame_hdr.header_size_in_bytes;
-  v4l2_frame_params.uncompressed_header_size =
-      frame_hdr.uncompressed_header_size;
-  v4l2_frame_params.profile = frame_hdr.profile;
-  // As per the VP9 specification:
-  switch (frame_hdr.reset_frame_context) {
-    // "0 or 1 implies don’t reset."
-    case 0:
-    case 1:
-      v4l2_frame_params.reset_frame_context = V4L2_VP9_RESET_FRAME_CTX_NONE;
-      break;
-    // "2 resets just the context specified in the frame header."
-    case 2:
-      v4l2_frame_params.reset_frame_context = V4L2_VP9_RESET_FRAME_CTX_SPEC;
-      break;
-    // "3 reset all contexts."
-    case 3:
-      v4l2_frame_params.reset_frame_context = V4L2_VP9_RESET_FRAME_CTX_ALL;
-      break;
-    default:
-      LOG(FATAL) << "Invalid reset frame context value!";
-      v4l2_frame_params.reset_frame_context = V4L2_VP9_RESET_FRAME_CTX_NONE;
-      break;
-  }
-  v4l2_frame_params.frame_context_idx =
-      frame_hdr.frame_context_idx_to_save_probs;
-  v4l2_frame_params.bit_depth = frame_hdr.bit_depth;
-  v4l2_frame_params.interpolation_filter = frame_hdr.interpolation_filter;
-  v4l2_frame_params.tile_cols_log2 = frame_hdr.tile_cols_log2;
-  v4l2_frame_params.tile_rows_log2 = frame_hdr.tile_rows_log2;
-  v4l2_frame_params.tx_mode = frame_hdr.compressed_header.tx_mode;
-  v4l2_frame_params.reference_mode = frame_hdr.compressed_header.reference_mode;
-  static_assert(VP9_FRAME_LAST + (V4L2_REF_ID_CNT - 1) <
-                    std::extent<decltype(frame_hdr.ref_frame_sign_bias)>::value,
-                "array sizes are incompatible");
-  for (size_t i = 0; i < V4L2_REF_ID_CNT; i++) {
-    v4l2_frame_params.ref_frame_sign_biases |=
-        (frame_hdr.ref_frame_sign_bias[i + VP9_FRAME_LAST] ? (1 << i) : 0);
-  }
-  v4l2_frame_params.frame_width_minus_1 = frame_hdr.frame_width - 1;
-  v4l2_frame_params.frame_height_minus_1 = frame_hdr.frame_height - 1;
-  v4l2_frame_params.render_width_minus_1 = frame_hdr.render_width - 1;
-  v4l2_frame_params.render_height_minus_1 = frame_hdr.render_height - 1;
-
-  constexpr uint64_t kInvalidSurface = std::numeric_limits<uint32_t>::max();
-
-  for (size_t i = 0; i < base::size(frame_hdr.ref_frame_idx); ++i) {
-    const auto idx = frame_hdr.ref_frame_idx[i];
-
-    LOG_ASSERT(idx < kVp9NumRefFrames) << "Invalid reference frame index.\n";
-
-    static_assert(
-        base::size(frame_hdr.ref_frame_idx) ==
-            base::size(v4l2_frame_params.refs),
-        "The number of reference frames in |Vp9FrameHeader| does not match "
-        "|v4l2_ctrl_vp9_frame_decode_params|. Fix |Vp9FrameHeader|.");
-
-    v4l2_frame_params.refs[i] =
-        ref_frames_[idx] ? ref_frames_[idx]->reference_id() : kInvalidSurface;
-  }
-  // TODO(stevecho): fill in the rest of |v4l2_frame_params| fields.
-  FillV4L2VP9QuantizationParams(frame_hdr.quant_params,
-                                &v4l2_frame_params.quant);
-  FillV4L2VP9ProbsParams(frame_hdr.frame_context, &v4l2_frame_params.probs);
-
-  const Vp9Parser::Context& context = vp9_parser_->context();
-  const Vp9LoopFilterParams& lf_params = context.loop_filter();
-  const Vp9SegmentationParams& segm_params = context.segmentation();
-
-  FillV4L2VP9LoopFilterParams(lf_params, &v4l2_frame_params.lf);
-  FillV4L2VP9SegmentationParams(segm_params, &v4l2_frame_params.seg);
+  SetupFrameParams(frame_hdr, &v4l2_frame_params);
 
   if (!v4l2_ioctl_->SetExtCtrls(OUTPUT_queue_, v4l2_frame_params))
     LOG(ERROR) << "VIDIOC_S_EXT_CTRLS failed.";

media/gpu/v4l2/test/vp9_decoder.h

diff --git a/media/gpu/v4l2/test/vp9_decoder.h b/media/gpu/v4l2/test/vp9_decoder.h
index 655de49..023683c 100644
--- a/media/gpu/v4l2/test/vp9_decoder.h
+++ b/media/gpu/v4l2/test/vp9_decoder.h
@@ -55,6 +55,12 @@
   Vp9Parser::Result ReadNextFrame(Vp9FrameHeader& vp9_frame_header,
                                   gfx::Size& size);
 
+  // Sets up per frame parameters |v4l2_frame_params| needed for VP9 decoding
+  // with VIDIOC_S_EXT_CTRLS ioctl call.
+  void SetupFrameParams(
+      const Vp9FrameHeader& frame_hdr,
+      struct v4l2_ctrl_vp9_frame_decode_params* v4l2_frame_params);
+
   // Refreshes |ref_frames_| slots with the current |buffer|.
   void RefreshReferenceSlots(const uint8_t refresh_frame_flags,
                              scoped_refptr<MmapedBuffer> buffer);

media/renderers/win/media_engine_notify_impl.cc

diff --git a/media/renderers/win/media_engine_notify_impl.cc b/media/renderers/win/media_engine_notify_impl.cc
index 18220d5..5852a50 100644
--- a/media/renderers/win/media_engine_notify_impl.cc
+++ b/media/renderers/win/media_engine_notify_impl.cc
@@ -98,15 +98,19 @@
 HRESULT MediaEngineNotifyImpl::RuntimeClassInitialize(
     ErrorCB error_cb,
     EndedCB ended_cb,
-    BufferingStateChangedCB buffering_state_changed_cb,
-    VideoNaturalSizeChangedCB video_natural_size_changed_cb,
+    FormatChangeCB format_change_cb,
+    LoadedDataCB loaded_data_cb,
+    PlayingCB playing_cb,
+    WaitingCB waiting_cb,
     TimeUpdateCB time_update_cb) {
   DVLOG_FUNC(1);
 
   error_cb_ = std::move(error_cb);
   ended_cb_ = std::move(ended_cb);
-  buffering_state_changed_cb_ = std::move(buffering_state_changed_cb);
-  video_natural_size_changed_cb_ = std::move(video_natural_size_changed_cb);
+  format_change_cb_ = std::move(format_change_cb);
+  loaded_data_cb_ = std::move(loaded_data_cb);
+  playing_cb_ = std::move(playing_cb);
+  waiting_cb_ = std::move(waiting_cb);
   time_update_cb_ = std::move(time_update_cb);
   return S_OK;
 }
@@ -139,20 +143,16 @@
       ended_cb_.Run();
       break;
     case MF_MEDIA_ENGINE_EVENT_FORMATCHANGE:
-      video_natural_size_changed_cb_.Run();
+      format_change_cb_.Run();
       break;
     case MF_MEDIA_ENGINE_EVENT_LOADEDDATA:
-      video_natural_size_changed_cb_.Run();
-      FALLTHROUGH;
+      loaded_data_cb_.Run();
+      break;
     case MF_MEDIA_ENGINE_EVENT_PLAYING:
-      buffering_state_changed_cb_.Run(
-          BufferingState::BUFFERING_HAVE_ENOUGH,
-          BufferingStateChangeReason::BUFFERING_CHANGE_REASON_UNKNOWN);
+      playing_cb_.Run();
       break;
     case MF_MEDIA_ENGINE_EVENT_WAITING:
-      buffering_state_changed_cb_.Run(
-          BufferingState::BUFFERING_HAVE_NOTHING,
-          BufferingStateChangeReason::BUFFERING_CHANGE_REASON_UNKNOWN);
+      waiting_cb_.Run();
       break;
     case MF_MEDIA_ENGINE_EVENT_TIMEUPDATE:
       time_update_cb_.Run();

media/renderers/win/media_engine_notify_impl.h

diff --git a/media/renderers/win/media_engine_notify_impl.h b/media/renderers/win/media_engine_notify_impl.h
index fd03064..f94c209 100644
--- a/media/renderers/win/media_engine_notify_impl.h
+++ b/media/renderers/win/media_engine_notify_impl.h
@@ -29,17 +29,19 @@
 
   using ErrorCB = base::RepeatingCallback<void(PipelineStatus, HRESULT)>;
   using EndedCB = base::RepeatingClosure;
-  using BufferingStateChangedCB =
-      base::RepeatingCallback<void(BufferingState, BufferingStateChangeReason)>;
-  using VideoNaturalSizeChangedCB = base::RepeatingClosure;
+  using FormatChangeCB = base::RepeatingClosure;
+  using LoadedDataCB = base::RepeatingClosure;
+  using PlayingCB = base::RepeatingClosure;
+  using WaitingCB = base::RepeatingClosure;
   using TimeUpdateCB = base::RepeatingClosure;
 
-  HRESULT RuntimeClassInitialize(
-      ErrorCB error_cb,
-      EndedCB ended_cb,
-      BufferingStateChangedCB buffering_state_changed_cb,
-      VideoNaturalSizeChangedCB video_natural_size_changed_cb,
-      TimeUpdateCB time_update_cb);
+  HRESULT RuntimeClassInitialize(ErrorCB error_cb,
+                                 EndedCB ended_cb,
+                                 FormatChangeCB format_change_cb,
+                                 LoadedDataCB loaded_data_cb,
+                                 PlayingCB playing_cb,
+                                 WaitingCB waiting_cb,
+                                 TimeUpdateCB time_update_cb);
 
   // IMFMediaEngineNotify implementation.
   IFACEMETHODIMP EventNotify(DWORD event_code,
@@ -54,8 +56,10 @@
   // e.g. using BindToCurrentLoop().
   ErrorCB error_cb_;
   EndedCB ended_cb_;
-  BufferingStateChangedCB buffering_state_changed_cb_;
-  VideoNaturalSizeChangedCB video_natural_size_changed_cb_;
+  FormatChangeCB format_change_cb_;
+  LoadedDataCB loaded_data_cb_;
+  PlayingCB playing_cb_;
+  WaitingCB waiting_cb_;
   TimeUpdateCB time_update_cb_;
 
   // EventNotify is invoked from MF threadpool thread where the callbacks are

media/renderers/win/media_foundation_renderer.cc

diff --git a/media/renderers/win/media_foundation_renderer.cc b/media/renderers/win/media_foundation_renderer.cc
index 9cafaba2..3102930 100644
--- a/media/renderers/win/media_foundation_renderer.cc
+++ b/media/renderers/win/media_foundation_renderer.cc
@@ -150,9 +150,13 @@
       BindToCurrentLoop(base::BindRepeating(
           &MediaFoundationRenderer::OnPlaybackEnded, weak_this)),
       BindToCurrentLoop(base::BindRepeating(
-          &MediaFoundationRenderer::OnBufferingStateChange, weak_this)),
+          &MediaFoundationRenderer::OnFormatChange, weak_this)),
       BindToCurrentLoop(base::BindRepeating(
-          &MediaFoundationRenderer::OnVideoNaturalSizeChange, weak_this)),
+          &MediaFoundationRenderer::OnLoadedData, weak_this)),
+      BindToCurrentLoop(
+          base::BindRepeating(&MediaFoundationRenderer::OnPlaying, weak_this)),
+      BindToCurrentLoop(
+          base::BindRepeating(&MediaFoundationRenderer::OnWaiting, weak_this)),
       BindToCurrentLoop(base::BindRepeating(
           &MediaFoundationRenderer::OnTimeUpdate, weak_this))));
 
@@ -210,7 +214,7 @@
   // Has encrypted stream.
   RETURN_IF_FAILED(MakeAndInitialize<MediaFoundationProtectionManager>(
       &content_protection_manager_, task_runner_,
-      base::BindRepeating(&MediaFoundationRenderer::OnWaiting,
+      base::BindRepeating(&MediaFoundationRenderer::OnProtectionManagerWaiting,
                           weak_factory_.GetWeakPtr())));
   ComPtr<IMFMediaEngineProtectedContent> protected_media_engine;
   RETURN_IF_FAILED(mf_media_engine_.As(&protected_media_engine));
@@ -360,13 +364,12 @@
 void MediaFoundationRenderer::Flush(base::OnceClosure flush_cb) {
   DVLOG_FUNC(2);
 
-  HRESULT hr = mf_media_engine_->Pause();
+  HRESULT hr = PauseInternal();
   // Ignore any Pause() error. We can continue to flush |mf_source_| instead of
   // stopping the playback with error.
   DVLOG_IF(1, FAILED(hr)) << "Failed to pause playback on flush: "
                           << PrintHr(hr);
 
-  StopSendingStatistics();
   mf_source_->FlushStreams();
   std::move(flush_cb).Run();
 }
@@ -397,8 +400,6 @@
     renderer_client_->OnError(PipelineStatus::PIPELINE_ERROR_COULD_NOT_RENDER);
     return;
   }
-
-  StartSendingStatistics();
 }
 
 void MediaFoundationRenderer::SetPlaybackRate(double playback_rate) {
@@ -454,7 +455,7 @@
   if (needs_restart) {
     // If the media source indicates that we need to restart playback (e.g due
     // to a newly enabled stream being EOS), queue a pause and play operation.
-    mf_media_engine_->Pause();
+    PauseInternal();
     mf_media_engine_->Play();
   }
 }
@@ -614,6 +615,49 @@
   StopSendingStatistics();
 }
 
+void MediaFoundationRenderer::OnFormatChange() {
+  DVLOG_FUNC(3);
+  OnVideoNaturalSizeChange();
+}
+
+void MediaFoundationRenderer::OnLoadedData() {
+  DVLOG_FUNC(3);
+  OnVideoNaturalSizeChange();
+  OnBufferingStateChange(
+      BufferingState::BUFFERING_HAVE_ENOUGH,
+      BufferingStateChangeReason::BUFFERING_CHANGE_REASON_UNKNOWN);
+}
+
+void MediaFoundationRenderer::OnPlaying() {
+  DVLOG_FUNC(3);
+  OnBufferingStateChange(
+      BufferingState::BUFFERING_HAVE_ENOUGH,
+      BufferingStateChangeReason::BUFFERING_CHANGE_REASON_UNKNOWN);
+  // The OnPlaying callback from MediaEngineNotifyImpl lets us know that an
+  // MF_MEDIA_ENGINE_EVENT_PLAYING message has been received. At this point we
+  // can safely start sending Statistics as any asynchronous Flush action in
+  // media engine, which would have reset the engine's statistics, will have
+  // been completed.
+  StartSendingStatistics();
+}
+
+void MediaFoundationRenderer::OnWaiting() {
+  OnBufferingStateChange(
+      BufferingState::BUFFERING_HAVE_NOTHING,
+      BufferingStateChangeReason::BUFFERING_CHANGE_REASON_UNKNOWN);
+}
+
+void MediaFoundationRenderer::OnTimeUpdate() {
+  DVLOG_FUNC(3);
+  DCHECK(task_runner_->RunsTasksInCurrentSequence());
+}
+
+void MediaFoundationRenderer::OnProtectionManagerWaiting(WaitingReason reason) {
+  DVLOG_FUNC(2);
+  DCHECK(task_runner_->RunsTasksInCurrentSequence());
+  renderer_client_->OnWaiting(reason);
+}
+
 void MediaFoundationRenderer::OnBufferingStateChange(
     BufferingState state,
     BufferingStateChangeReason reason) {
@@ -635,6 +679,15 @@
   renderer_client_->OnBufferingStateChange(state, reason);
 }
 
+HRESULT MediaFoundationRenderer::PauseInternal() {
+  // Media Engine resets aggregate statistics when it flushes - such as a
+  // transition to the Pause state & then back to Play state. To try and
+  // avoid cases where we may get Media Engine's reset statistics call
+  // StopSendingStatistics before transitioning to Pause.
+  StopSendingStatistics();
+  return mf_media_engine_->Pause();
+}
+
 void MediaFoundationRenderer::OnVideoNaturalSizeChange() {
   DCHECK(task_runner_->RunsTasksInCurrentSequence());
 
@@ -673,15 +726,4 @@
   renderer_client_->OnVideoNaturalSizeChange(native_video_size_);
 }
 
-void MediaFoundationRenderer::OnTimeUpdate() {
-  DVLOG_FUNC(3);
-  DCHECK(task_runner_->RunsTasksInCurrentSequence());
-}
-
-void MediaFoundationRenderer::OnWaiting(WaitingReason reason) {
-  DVLOG_FUNC(2);
-  DCHECK(task_runner_->RunsTasksInCurrentSequence());
-  renderer_client_->OnWaiting(reason);
-}
-
 }  // namespace media

media/renderers/win/media_foundation_renderer.h

diff --git a/media/renderers/win/media_foundation_renderer.h b/media/renderers/win/media_foundation_renderer.h
index b87ed67..6de4f02 100644
--- a/media/renderers/win/media_foundation_renderer.h
+++ b/media/renderers/win/media_foundation_renderer.h
@@ -82,20 +82,26 @@
   // Callbacks for `mf_media_engine_notify_`.
   void OnPlaybackError(PipelineStatus status, HRESULT hr);
   void OnPlaybackEnded();
-  void OnBufferingStateChange(BufferingState state,
-                              BufferingStateChangeReason reason);
-  void OnVideoNaturalSizeChange();
+  void OnFormatChange();
+  void OnLoadedData();
+  void OnPlaying();
+  void OnWaiting();
   void OnTimeUpdate();
 
   // Callback for `content_protection_manager_`.
-  void OnWaiting(WaitingReason reason);
+  void OnProtectionManagerWaiting(WaitingReason reason);
 
   void OnCdmProxyReceived(scoped_refptr<MediaFoundationCdmProxy> cdm_proxy);
+  void OnBufferingStateChange(BufferingState state,
+                              BufferingStateChangeReason reason);
 
   HRESULT SetDCompModeInternal();
   HRESULT GetDCompSurfaceInternal(HANDLE* surface_handle);
   HRESULT SetSourceOnMediaEngine();
   HRESULT UpdateVideoStream(const gfx::Rect& rect);
+  HRESULT PauseInternal();
+
+  void OnVideoNaturalSizeChange();
 
   // Renderer methods are running in the same sequence.
   scoped_refptr<base::SequencedTaskRunner> task_runner_;

mojo/public/tools/bindings/generators/cpp_templates/union_data_view_declaration.tmpl

diff --git a/mojo/public/tools/bindings/generators/cpp_templates/union_data_view_declaration.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/union_data_view_declaration.tmpl
index 7ac5d691..a3a9ee5 100644
--- a/mojo/public/tools/bindings/generators/cpp_templates/union_data_view_declaration.tmpl
+++ b/mojo/public/tools/bindings/generators/cpp_templates/union_data_view_declaration.tmpl
@@ -30,12 +30,12 @@
 
 {%-   if kind|is_object_kind %}
   inline void Get{{name|under_to_camel}}DataView(
-      {{kind|cpp_data_view_type}}* output);
+      {{kind|cpp_data_view_type}}* output) const;
 
   template <typename UserType>
-  WARN_UNUSED_RESULT bool Read{{name|under_to_camel}}(UserType* output) {
+  WARN_UNUSED_RESULT bool Read{{name|under_to_camel}}(UserType* output) const {
     {{struct_macros.assert_nullable_output_type_if_necessary(kind, name)}}
-    DCHECK(is_{{name}}());
+    CHECK(is_{{name}}());
     return mojo::internal::Deserialize<{{kind|unmapped_type_for_serializer}}>(
         data_->data.f_{{name}}.Get(), output, message_);
   }
@@ -43,14 +43,14 @@
 {%-   elif kind|is_enum_kind %}
   template <typename UserType>
   WARN_UNUSED_RESULT bool Read{{name|under_to_camel}}(UserType* output) const {
-    DCHECK(is_{{name}}());
+    CHECK(is_{{name}}());
     return mojo::internal::Deserialize<{{kind|unmapped_type_for_serializer}}>(
         data_->data.f_{{name}}, output);
   }
 
 {%-     if not kind|is_typemapped_kind %}
   {{kind|cpp_data_view_type}} {{name}}() const {
-    DCHECK(is_{{name}}());
+    CHECK(is_{{name}}());
     // TODO(dcheng): This seems incorrect, as it bypasses enum traits.
     return ::mojo::internal::ToKnownEnumValueHelper(
         static_cast<{{kind|unmapped_type_for_serializer}}>(data_->data.f_{{name}}));
@@ -59,30 +59,30 @@
 
 {%-   elif kind|is_any_handle_kind %}
   {{kind|cpp_data_view_type}} Take{{name|under_to_camel}}() {
-    DCHECK(is_{{name}}());
+    CHECK(is_{{name}}());
     {{kind|cpp_data_view_type}} result;
     bool ret =
         mojo::internal::Deserialize<{{kind|unmapped_type_for_serializer}}>(
             &data_->data.f_{{name}}, &result, message_);
-    DCHECK(ret);
+    CHECK(ret);
     return result;
   }
 
 {%-   elif kind|is_any_interface_kind %}
   template <typename UserType>
   UserType Take{{name|under_to_camel}}() {
-    DCHECK(is_{{name}}());
+    CHECK(is_{{name}}());
     UserType result;
     bool ret =
         mojo::internal::Deserialize<{{kind|unmapped_type_for_serializer}}>(
             &data_->data.f_{{name}}, &result, message_);
-    DCHECK(ret);
+    CHECK(ret);
     return result;
   }
 
 {%-   else %}
   {{kind|cpp_data_view_type}} {{name}}() const {
-    DCHECK(is_{{name}}());
+    CHECK(is_{{name}}());
     return data_->data.f_{{name}};
   }
 

mojo/public/tools/bindings/generators/cpp_templates/union_data_view_definition.tmpl

diff --git a/mojo/public/tools/bindings/generators/cpp_templates/union_data_view_definition.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/union_data_view_definition.tmpl
index b906806e..bfdbf77 100644
--- a/mojo/public/tools/bindings/generators/cpp_templates/union_data_view_definition.tmpl
+++ b/mojo/public/tools/bindings/generators/cpp_templates/union_data_view_definition.tmpl
@@ -4,8 +4,8 @@
 
 {%-   if kind|is_object_kind %}
 inline void {{union.name}}DataView::Get{{name|under_to_camel}}DataView(
-    {{kind|cpp_data_view_type}}* output) {
-  DCHECK(is_{{name}}());
+    {{kind|cpp_data_view_type}}* output) const {
+  CHECK(is_{{name}}());
   *output = {{kind|cpp_data_view_type}}(data_->data.f_{{name}}.Get(), message_);
 }
 {%-   endif %}

mojo/public/tools/bindings/generators/cpp_templates/wrapper_union_class_declaration.tmpl

diff --git a/mojo/public/tools/bindings/generators/cpp_templates/wrapper_union_class_declaration.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/wrapper_union_class_declaration.tmpl
index 846eddd1..1014ad8 100644
--- a/mojo/public/tools/bindings/generators/cpp_templates/wrapper_union_class_declaration.tmpl
+++ b/mojo/public/tools/bindings/generators/cpp_templates/wrapper_union_class_declaration.tmpl
@@ -68,7 +68,7 @@
 
   {{ kythe_annotation("%s.%s"|format(union_prefix, field.name)) }}
   {{field.kind|cpp_union_getter_return_type}} get_{{field.name}}() const {
-    DCHECK(tag_ == Tag::{{field.name|upper}});
+    CHECK(tag_ == Tag::{{field.name|upper}});
 {%-   if field.kind|is_object_kind or
          field.kind|is_any_handle_or_interface_kind %}
     return *(data_.{{field.name}});

mojo/public/tools/bindings/mojom.gni

diff --git a/mojo/public/tools/bindings/mojom.gni b/mojo/public/tools/bindings/mojom.gni
index 5dd2cb9..f1e4173 100644
--- a/mojo/public/tools/bindings/mojom.gni
+++ b/mojo/public/tools/bindings/mojom.gni
@@ -626,13 +626,14 @@
   build_metadata_filename = "$target_gen_dir/$target_name.build_metadata"
   build_metadata = {
   }
-  build_metadata.sources = rebase_path(sources_list)
+  build_metadata.sources = rebase_path(sources_list, target_gen_dir)
   build_metadata.deps = []
   foreach(dep, all_deps) {
     dep_target_gen_dir = get_label_info(dep, "target_gen_dir")
     dep_name = get_label_info(dep, "name")
     build_metadata.deps +=
-        [ rebase_path("$dep_target_gen_dir/$dep_name.build_metadata") ]
+        [ rebase_path("$dep_target_gen_dir/$dep_name.build_metadata",
+                      target_gen_dir) ]
   }
   write_file(build_metadata_filename, build_metadata, "json")
 

mojo/public/tools/mojom/mojom_parser.py

diff --git a/mojo/public/tools/mojom/mojom_parser.py b/mojo/public/tools/mojom/mojom_parser.py
index 6a4770a..0cad7f10 100755
--- a/mojo/public/tools/mojom/mojom_parser.py
+++ b/mojo/public/tools/mojom/mojom_parser.py
@@ -161,11 +161,20 @@
 
   def collect(metadata_filename):
     processed_deps.add(metadata_filename)
+
+    # Paths in the metadata file are relative to the metadata file's dir.
+    metadata_dir = os.path.abspath(os.path.dirname(metadata_filename))
+
+    def to_abs(s):
+      return os.path.normpath(os.path.join(metadata_dir, s))
+
     with open(metadata_filename) as f:
       metadata = json.load(f)
       allowed_imports.update(
-          map(os.path.normcase, map(os.path.normpath, metadata['sources'])))
+          [os.path.normcase(to_abs(s)) for s in metadata['sources']])
       for dep_metadata in metadata['deps']:
+        dep_metadata = to_abs(dep_metadata)
+        print(dep_metadata)
         if dep_metadata not in processed_deps:
           collect(dep_metadata)
 

testing/buildbot/filters/stable_test_filters/linux-stable-filter-combined-rel/blink_web_tests.filter

diff --git a/testing/buildbot/filters/stable_test_filters/linux-stable-filter-combined-rel/blink_web_tests.filter b/testing/buildbot/filters/stable_test_filters/linux-stable-filter-combined-rel/blink_web_tests.filter
index 2246ecb7..db85355 100644
--- a/testing/buildbot/filters/stable_test_filters/linux-stable-filter-combined-rel/blink_web_tests.filter
+++ b/testing/buildbot/filters/stable_test_filters/linux-stable-filter-combined-rel/blink_web_tests.filter
@@ -4747,9 +4747,9 @@
 -external/wpt/beacon/headers/header-referrer-unsafe-url.https.html
 -external/wpt/beacon/idlharness.any.html
 -external/wpt/bluetooth/getDevices/no-granted-devices.https.window.html
--external/wpt/bluetooth/idl/idl-BluetoothUUID.html
--external/wpt/bluetooth/idl/idl-NavigatorBluetooth.html
--external/wpt/bluetooth/idl/idl-NavigatorBluetooth.https.html
+-external/wpt/bluetooth/idl/idl-BluetoothUUID.window.html
+-external/wpt/bluetooth/idl/idl-NavigatorBluetooth.window.html
+-external/wpt/bluetooth/idl/idl-NavigatorBluetooth.https.window.html
 -external/wpt/bluetooth/idl/idlharness.tentative.https.window.html
 -external/wpt/bluetooth/requestDevice/not-processing-user-gesture.https.window.html
 -external/wpt/client-hints/accept-ch-answers.sub.https.html
@@ -51883,9 +51883,9 @@
 -virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/adapter/adapter-powered-off-getAvailability.https.window.html
 -virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/adapter/adapter-removed-getAvailability.https.window.html
 -virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/getDevices/no-granted-devices.https.window.html
--virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/idl/idl-Bluetooth.https.html
--virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/idl/idl-BluetoothUUID.html
--virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/idl/idl-NavigatorBluetooth.html
+-virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/idl/idl-Bluetooth.https.window.html
+-virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/idl/idl-BluetoothUUID.window.html
+-virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/idl/idl-NavigatorBluetooth.window.html
 -virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/idl/idlharness.tentative.https.window.html
 -virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/requestDevice/not-processing-user-gesture.https.window.html
 -virtual/web-bluetooth-new-permissions-backend/wpt_internal/bluetooth/idl/idl-BluetoothGATTRemoteServer.https.html

testing/buildbot/filters/stable_test_filters/linux-stable-filter-combined-rel/not_site_per_process_blink_web_tests.filter

diff --git a/testing/buildbot/filters/stable_test_filters/linux-stable-filter-combined-rel/not_site_per_process_blink_web_tests.filter b/testing/buildbot/filters/stable_test_filters/linux-stable-filter-combined-rel/not_site_per_process_blink_web_tests.filter
index 6729293..d97b984 100644
--- a/testing/buildbot/filters/stable_test_filters/linux-stable-filter-combined-rel/not_site_per_process_blink_web_tests.filter
+++ b/testing/buildbot/filters/stable_test_filters/linux-stable-filter-combined-rel/not_site_per_process_blink_web_tests.filter
@@ -5146,9 +5146,9 @@
 -external/wpt/bluetooth/adapter/adapter-powered-on-getAvailability.https.window.html
 -external/wpt/bluetooth/adapter/adapter-removed-getAvailability.https.window.html
 -external/wpt/bluetooth/getDevices/no-granted-devices.https.window.html
--external/wpt/bluetooth/idl/idl-Bluetooth.https.html
--external/wpt/bluetooth/idl/idl-NavigatorBluetooth.html
--external/wpt/bluetooth/idl/idl-NavigatorBluetooth.https.html
+-external/wpt/bluetooth/idl/idl-Bluetooth.https.window.html
+-external/wpt/bluetooth/idl/idl-NavigatorBluetooth.window.html
+-external/wpt/bluetooth/idl/idl-NavigatorBluetooth.https.window.html
 -external/wpt/bluetooth/idl/idlharness.tentative.https.window.html
 -external/wpt/bluetooth/requestDevice/cross-origin-iframe.sub.https.window.html
 -external/wpt/bluetooth/requestDevice/not-processing-user-gesture.https.window.html
@@ -55831,10 +55831,10 @@
 -virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/adapter/adapter-powered-on-off-on-getAvailability.https.window.html
 -virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/adapter/adapter-removed-getAvailability.https.window.html
 -virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/getDevices/no-granted-devices.https.window.html
--virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/idl/idl-Bluetooth.https.html
--virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/idl/idl-BluetoothUUID.html
--virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/idl/idl-NavigatorBluetooth.html
--virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/idl/idl-NavigatorBluetooth.https.html
+-virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/idl/idl-Bluetooth.https.window.html
+-virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/idl/idl-BluetoothUUID.window.html
+-virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/idl/idl-NavigatorBluetooth.window.html
+-virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/idl/idl-NavigatorBluetooth.https.window.html
 -virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/idl/idlharness.tentative.https.window.html
 -virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/requestDevice/not-processing-user-gesture.https.window.html
 -virtual/web-bluetooth-new-permissions-backend/wpt_internal/bluetooth/idl/idl-BluetoothGATTRemoteServer.https.html

testing/buildbot/filters/stable_test_filters/linux-stable-filter-rel/blink_web_tests.filter

diff --git a/testing/buildbot/filters/stable_test_filters/linux-stable-filter-rel/blink_web_tests.filter b/testing/buildbot/filters/stable_test_filters/linux-stable-filter-rel/blink_web_tests.filter
index 2246ecb7..db85355 100644
--- a/testing/buildbot/filters/stable_test_filters/linux-stable-filter-rel/blink_web_tests.filter
+++ b/testing/buildbot/filters/stable_test_filters/linux-stable-filter-rel/blink_web_tests.filter
@@ -4747,9 +4747,9 @@
 -external/wpt/beacon/headers/header-referrer-unsafe-url.https.html
 -external/wpt/beacon/idlharness.any.html
 -external/wpt/bluetooth/getDevices/no-granted-devices.https.window.html
--external/wpt/bluetooth/idl/idl-BluetoothUUID.html
--external/wpt/bluetooth/idl/idl-NavigatorBluetooth.html
--external/wpt/bluetooth/idl/idl-NavigatorBluetooth.https.html
+-external/wpt/bluetooth/idl/idl-BluetoothUUID.window.html
+-external/wpt/bluetooth/idl/idl-NavigatorBluetooth.window.html
+-external/wpt/bluetooth/idl/idl-NavigatorBluetooth.https.window.html
 -external/wpt/bluetooth/idl/idlharness.tentative.https.window.html
 -external/wpt/bluetooth/requestDevice/not-processing-user-gesture.https.window.html
 -external/wpt/client-hints/accept-ch-answers.sub.https.html
@@ -51883,9 +51883,9 @@
 -virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/adapter/adapter-powered-off-getAvailability.https.window.html
 -virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/adapter/adapter-removed-getAvailability.https.window.html
 -virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/getDevices/no-granted-devices.https.window.html
--virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/idl/idl-Bluetooth.https.html
--virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/idl/idl-BluetoothUUID.html
--virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/idl/idl-NavigatorBluetooth.html
+-virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/idl/idl-Bluetooth.https.window.html
+-virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/idl/idl-BluetoothUUID.window.html
+-virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/idl/idl-NavigatorBluetooth.window.html
 -virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/idl/idlharness.tentative.https.window.html
 -virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/requestDevice/not-processing-user-gesture.https.window.html
 -virtual/web-bluetooth-new-permissions-backend/wpt_internal/bluetooth/idl/idl-BluetoothGATTRemoteServer.https.html

testing/buildbot/filters/stable_test_filters/linux-stable-filter-rel/not_site_per_process_blink_web_tests.filter

diff --git a/testing/buildbot/filters/stable_test_filters/linux-stable-filter-rel/not_site_per_process_blink_web_tests.filter b/testing/buildbot/filters/stable_test_filters/linux-stable-filter-rel/not_site_per_process_blink_web_tests.filter
index 6729293..d97b984 100644
--- a/testing/buildbot/filters/stable_test_filters/linux-stable-filter-rel/not_site_per_process_blink_web_tests.filter
+++ b/testing/buildbot/filters/stable_test_filters/linux-stable-filter-rel/not_site_per_process_blink_web_tests.filter
@@ -5146,9 +5146,9 @@
 -external/wpt/bluetooth/adapter/adapter-powered-on-getAvailability.https.window.html
 -external/wpt/bluetooth/adapter/adapter-removed-getAvailability.https.window.html
 -external/wpt/bluetooth/getDevices/no-granted-devices.https.window.html
--external/wpt/bluetooth/idl/idl-Bluetooth.https.html
--external/wpt/bluetooth/idl/idl-NavigatorBluetooth.html
--external/wpt/bluetooth/idl/idl-NavigatorBluetooth.https.html
+-external/wpt/bluetooth/idl/idl-Bluetooth.https.window.html
+-external/wpt/bluetooth/idl/idl-NavigatorBluetooth.window.html
+-external/wpt/bluetooth/idl/idl-NavigatorBluetooth.https.window.html
 -external/wpt/bluetooth/idl/idlharness.tentative.https.window.html
 -external/wpt/bluetooth/requestDevice/cross-origin-iframe.sub.https.window.html
 -external/wpt/bluetooth/requestDevice/not-processing-user-gesture.https.window.html
@@ -55831,10 +55831,10 @@
 -virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/adapter/adapter-powered-on-off-on-getAvailability.https.window.html
 -virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/adapter/adapter-removed-getAvailability.https.window.html
 -virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/getDevices/no-granted-devices.https.window.html
--virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/idl/idl-Bluetooth.https.html
--virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/idl/idl-BluetoothUUID.html
--virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/idl/idl-NavigatorBluetooth.html
--virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/idl/idl-NavigatorBluetooth.https.html
+-virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/idl/idl-Bluetooth.https.window.html
+-virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/idl/idl-BluetoothUUID.window.html
+-virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/idl/idl-NavigatorBluetooth.window.html
+-virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/idl/idl-NavigatorBluetooth.https.window.html
 -virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/idl/idlharness.tentative.https.window.html
 -virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/requestDevice/not-processing-user-gesture.https.window.html
 -virtual/web-bluetooth-new-permissions-backend/wpt_internal/bluetooth/idl/idl-BluetoothGATTRemoteServer.https.html

testing/scripts/run_variations_smoke_tests.py

diff --git a/testing/scripts/run_variations_smoke_tests.py b/testing/scripts/run_variations_smoke_tests.py
index 3d967e7..b795443 100755
--- a/testing/scripts/run_variations_smoke_tests.py
+++ b/testing/scripts/run_variations_smoke_tests.py
@@ -45,8 +45,8 @@
         # TODO(crbug.com/1234165): Make tests hermetic by using a test http
         # server or WPR.
         'url': 'https://chromium.org/',
-        'expected_id': 'sites-chrome-userheader-title',
-        'expected_text': 'The Chromium Projects',
+        'expected_id': 'chromium',
+        'expected_text': 'Chromium',
     },
 ]
 

testing/variations/fieldtrial_testing_config.json

diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json
index 2a4406d9..b36cc139 100644
--- a/testing/variations/fieldtrial_testing_config.json
+++ b/testing/variations/fieldtrial_testing_config.json
@@ -7172,7 +7172,7 @@
             ]
         }
     ],
-    "SetTimeoutWithoutClamp": [
+    "SetTimeoutZeroWithoutClamping": [
         {
             "platforms": [
                 "android",
@@ -7186,7 +7186,7 @@
             ],
             "experiments": [
                 {
-                    "name": "Enabled",
+                    "name": "Enabled_20211210",
                     "enable_features": [
                         "SetTimeoutWithoutClamp"
                     ]

third_party/blink/renderer/bindings/core/v8/v8_idle_task_runner.h

diff --git a/third_party/blink/renderer/bindings/core/v8/v8_idle_task_runner.h b/third_party/blink/renderer/bindings/core/v8/v8_idle_task_runner.h
index ab5e1cee..f640c58b 100644
--- a/third_party/blink/renderer/bindings/core/v8/v8_idle_task_runner.h
+++ b/third_party/blink/renderer/bindings/core/v8/v8_idle_task_runner.h
@@ -35,6 +35,8 @@
 #include "third_party/blink/renderer/platform/runtime_enabled_features.h"
 #include "third_party/blink/renderer/platform/scheduler/public/thread.h"
 #include "third_party/blink/renderer/platform/scheduler/public/thread_scheduler.h"
+#include "third_party/blink/renderer/platform/wtf/cross_thread_functional.h"
+#include "third_party/blink/renderer/platform/wtf/functional.h"
 
 namespace blink {
 
@@ -53,11 +55,11 @@
     DCHECK(RuntimeEnabledFeatures::V8IdleTasksEnabled());
     scheduler_->PostIdleTask(
         FROM_HERE,
-        WTF::Bind(
+        ConvertToBaseOnceCallback(WTF::CrossThreadBindOnce(
             [](std::unique_ptr<v8::IdleTask> task, base::TimeTicks deadline) {
               task->Run(deadline.since_origin().InSecondsF());
             },
-            std::move(task)));
+            std::move(task))));
   }
 
  private:

third_party/blink/renderer/core/css/affected_by_pseudo_test.cc

diff --git a/third_party/blink/renderer/core/css/affected_by_pseudo_test.cc b/third_party/blink/renderer/core/css/affected_by_pseudo_test.cc
index fb15830..a69bb9e 100644
--- a/third_party/blink/renderer/core/css/affected_by_pseudo_test.cc
+++ b/third_party/blink/renderer/core/css/affected_by_pseudo_test.cc
@@ -452,4 +452,264 @@
   ASSERT_EQ(1U, element_count);
 }
 
+TEST_F(AffectedByPseudoTest,
+       AffectedByDescendantPseudoStateAndAncestorsAffectedByHover) {
+  SetHtmlInnerHTML(R"HTML(
+    <style>
+      .a:has(.b:hover) { background-color: lime; }
+      .c:has(:hover) { background-color: green; }
+      .d:has(.e) { background-color: blue }
+    </style>
+    <div id=div1>
+      <div id=div2 class='a'>
+        <div id=div3></div>
+        <div id=div4></div>
+      </div>
+      <div id=div5 class='a'>
+        <div id=div6></div>
+        <div id=div7 class='b'></div>
+      </div>
+      <div id=div8 class='c'>
+        <div id=div9></div>
+        <div id=div10></div>
+      </div>
+      <div id=div11 class='d'>
+        <div id=div12></div>
+        <div id=div13></div>
+      </div>
+    </div>
+  )HTML");
+
+  UpdateAllLifecyclePhasesForTest();
+  EXPECT_TRUE(
+      GetElementById("div2")->GetComputedStyle()->AffectedByPseudoInHas());
+  EXPECT_FALSE(GetElementById("div2")
+                   ->GetComputedStyle()
+                   ->AncestorsAffectedByHoverInHas());
+  EXPECT_FALSE(
+      GetElementById("div3")->GetComputedStyle()->AffectedByPseudoInHas());
+  EXPECT_FALSE(GetElementById("div3")
+                   ->GetComputedStyle()
+                   ->AncestorsAffectedByHoverInHas());
+  EXPECT_FALSE(
+      GetElementById("div4")->GetComputedStyle()->AffectedByPseudoInHas());
+  EXPECT_FALSE(GetElementById("div4")
+                   ->GetComputedStyle()
+                   ->AncestorsAffectedByHoverInHas());
+  EXPECT_TRUE(
+      GetElementById("div5")->GetComputedStyle()->AffectedByPseudoInHas());
+  EXPECT_TRUE(GetElementById("div5")
+                  ->GetComputedStyle()
+                  ->AncestorsAffectedByHoverInHas());
+  EXPECT_FALSE(
+      GetElementById("div6")->GetComputedStyle()->AffectedByPseudoInHas());
+  EXPECT_TRUE(GetElementById("div6")
+                  ->GetComputedStyle()
+                  ->AncestorsAffectedByHoverInHas());
+  EXPECT_FALSE(
+      GetElementById("div7")->GetComputedStyle()->AffectedByPseudoInHas());
+  EXPECT_TRUE(GetElementById("div7")
+                  ->GetComputedStyle()
+                  ->AncestorsAffectedByHoverInHas());
+  EXPECT_TRUE(
+      GetElementById("div8")->GetComputedStyle()->AffectedByPseudoInHas());
+  EXPECT_TRUE(GetElementById("div8")
+                  ->GetComputedStyle()
+                  ->AncestorsAffectedByHoverInHas());
+  EXPECT_FALSE(
+      GetElementById("div9")->GetComputedStyle()->AffectedByPseudoInHas());
+  EXPECT_TRUE(GetElementById("div9")
+                  ->GetComputedStyle()
+                  ->AncestorsAffectedByHoverInHas());
+  EXPECT_FALSE(
+      GetElementById("div10")->GetComputedStyle()->AffectedByPseudoInHas());
+  EXPECT_TRUE(GetElementById("div10")
+                  ->GetComputedStyle()
+                  ->AncestorsAffectedByHoverInHas());
+  EXPECT_FALSE(
+      GetElementById("div11")->GetComputedStyle()->AffectedByPseudoInHas());
+  EXPECT_FALSE(GetElementById("div11")
+                   ->GetComputedStyle()
+                   ->AncestorsAffectedByHoverInHas());
+  EXPECT_FALSE(
+      GetElementById("div12")->GetComputedStyle()->AffectedByPseudoInHas());
+  EXPECT_FALSE(GetElementById("div12")
+                   ->GetComputedStyle()
+                   ->AncestorsAffectedByHoverInHas());
+  EXPECT_FALSE(
+      GetElementById("div13")->GetComputedStyle()->AffectedByPseudoInHas());
+  EXPECT_FALSE(GetElementById("div13")
+                   ->GetComputedStyle()
+                   ->AncestorsAffectedByHoverInHas());
+
+  unsigned start_count = GetStyleEngine().StyleForElementCount();
+  GetElementById("div3")->SetHovered(true);
+  UpdateAllLifecyclePhasesForTest();
+  unsigned element_count =
+      GetStyleEngine().StyleForElementCount() - start_count;
+  ASSERT_EQ(0U, element_count);
+  GetElementById("div3")->SetHovered(false);
+  UpdateAllLifecyclePhasesForTest();
+
+  start_count = GetStyleEngine().StyleForElementCount();
+  GetElementById("div4")->SetHovered(true);
+  UpdateAllLifecyclePhasesForTest();
+  element_count = GetStyleEngine().StyleForElementCount() - start_count;
+  ASSERT_EQ(0U, element_count);
+  GetElementById("div4")->SetHovered(false);
+  UpdateAllLifecyclePhasesForTest();
+
+  start_count = GetStyleEngine().StyleForElementCount();
+  GetElementById("div4")->setAttribute(html_names::kClassAttr, "b");
+  UpdateAllLifecyclePhasesForTest();
+  element_count = GetStyleEngine().StyleForElementCount() - start_count;
+  ASSERT_EQ(3U, element_count);
+
+  EXPECT_TRUE(
+      GetElementById("div2")->GetComputedStyle()->AffectedByPseudoInHas());
+  EXPECT_TRUE(GetElementById("div2")
+                  ->GetComputedStyle()
+                  ->AncestorsAffectedByHoverInHas());
+  EXPECT_FALSE(
+      GetElementById("div3")->GetComputedStyle()->AffectedByPseudoInHas());
+  EXPECT_TRUE(GetElementById("div3")
+                  ->GetComputedStyle()
+                  ->AncestorsAffectedByHoverInHas());
+  EXPECT_FALSE(
+      GetElementById("div4")->GetComputedStyle()->AffectedByPseudoInHas());
+  EXPECT_TRUE(GetElementById("div4")
+                  ->GetComputedStyle()
+                  ->AncestorsAffectedByHoverInHas());
+
+  start_count = GetStyleEngine().StyleForElementCount();
+  GetElementById("div3")->setAttribute(html_names::kClassAttr, "b");
+  UpdateAllLifecyclePhasesForTest();
+  element_count = GetStyleEngine().StyleForElementCount() - start_count;
+  ASSERT_EQ(1U, element_count);
+
+  EXPECT_TRUE(
+      GetElementById("div2")->GetComputedStyle()->AffectedByPseudoInHas());
+  EXPECT_TRUE(GetElementById("div2")
+                  ->GetComputedStyle()
+                  ->AncestorsAffectedByHoverInHas());
+  EXPECT_FALSE(
+      GetElementById("div3")->GetComputedStyle()->AffectedByPseudoInHas());
+  EXPECT_TRUE(GetElementById("div3")
+                  ->GetComputedStyle()
+                  ->AncestorsAffectedByHoverInHas());
+  EXPECT_FALSE(
+      GetElementById("div4")->GetComputedStyle()->AffectedByPseudoInHas());
+  EXPECT_TRUE(GetElementById("div4")
+                  ->GetComputedStyle()
+                  ->AncestorsAffectedByHoverInHas());
+
+  start_count = GetStyleEngine().StyleForElementCount();
+  GetElementById("div3")->SetHovered(true);
+  UpdateAllLifecyclePhasesForTest();
+  element_count = GetStyleEngine().StyleForElementCount() - start_count;
+  ASSERT_EQ(1U, element_count);
+  GetElementById("div3")->SetHovered(false);
+  UpdateAllLifecyclePhasesForTest();
+
+  start_count = GetStyleEngine().StyleForElementCount();
+  GetElementById("div4")->SetHovered(true);
+  UpdateAllLifecyclePhasesForTest();
+  element_count = GetStyleEngine().StyleForElementCount() - start_count;
+  ASSERT_EQ(1U, element_count);
+  GetElementById("div4")->SetHovered(false);
+  UpdateAllLifecyclePhasesForTest();
+
+  start_count = GetStyleEngine().StyleForElementCount();
+  GetElementById("div3")->setAttribute(html_names::kClassAttr, "");
+  UpdateAllLifecyclePhasesForTest();
+  element_count = GetStyleEngine().StyleForElementCount() - start_count;
+  ASSERT_EQ(1U, element_count);
+
+  EXPECT_TRUE(
+      GetElementById("div2")->GetComputedStyle()->AffectedByPseudoInHas());
+  EXPECT_TRUE(GetElementById("div2")
+                  ->GetComputedStyle()
+                  ->AncestorsAffectedByHoverInHas());
+  EXPECT_FALSE(
+      GetElementById("div3")->GetComputedStyle()->AffectedByPseudoInHas());
+  EXPECT_TRUE(GetElementById("div3")
+                  ->GetComputedStyle()
+                  ->AncestorsAffectedByHoverInHas());
+  EXPECT_FALSE(
+      GetElementById("div4")->GetComputedStyle()->AffectedByPseudoInHas());
+  EXPECT_TRUE(GetElementById("div4")
+                  ->GetComputedStyle()
+                  ->AncestorsAffectedByHoverInHas());
+
+  start_count = GetStyleEngine().StyleForElementCount();
+  GetElementById("div4")->setAttribute(html_names::kClassAttr, "");
+  UpdateAllLifecyclePhasesForTest();
+  element_count = GetStyleEngine().StyleForElementCount() - start_count;
+  ASSERT_EQ(3U, element_count);
+
+  EXPECT_TRUE(
+      GetElementById("div2")->GetComputedStyle()->AffectedByPseudoInHas());
+  EXPECT_FALSE(GetElementById("div2")
+                   ->GetComputedStyle()
+                   ->AncestorsAffectedByHoverInHas());
+  EXPECT_FALSE(
+      GetElementById("div3")->GetComputedStyle()->AffectedByPseudoInHas());
+  EXPECT_FALSE(GetElementById("div3")
+                   ->GetComputedStyle()
+                   ->AncestorsAffectedByHoverInHas());
+  EXPECT_FALSE(
+      GetElementById("div4")->GetComputedStyle()->AffectedByPseudoInHas());
+  EXPECT_FALSE(GetElementById("div4")
+                   ->GetComputedStyle()
+                   ->AncestorsAffectedByHoverInHas());
+
+  start_count = GetStyleEngine().StyleForElementCount();
+  GetElementById("div6")->SetHovered(true);
+  UpdateAllLifecyclePhasesForTest();
+  element_count = GetStyleEngine().StyleForElementCount() - start_count;
+  ASSERT_EQ(1U, element_count);
+  GetElementById("div6")->SetHovered(false);
+  UpdateAllLifecyclePhasesForTest();
+
+  start_count = GetStyleEngine().StyleForElementCount();
+  GetElementById("div7")->SetHovered(true);
+  UpdateAllLifecyclePhasesForTest();
+  element_count = GetStyleEngine().StyleForElementCount() - start_count;
+  ASSERT_EQ(1U, element_count);
+  GetElementById("div7")->SetHovered(false);
+  UpdateAllLifecyclePhasesForTest();
+
+  start_count = GetStyleEngine().StyleForElementCount();
+  GetElementById("div9")->SetHovered(true);
+  UpdateAllLifecyclePhasesForTest();
+  element_count = GetStyleEngine().StyleForElementCount() - start_count;
+  ASSERT_EQ(1U, element_count);
+  GetElementById("div9")->SetHovered(false);
+  UpdateAllLifecyclePhasesForTest();
+
+  start_count = GetStyleEngine().StyleForElementCount();
+  GetElementById("div10")->SetHovered(true);
+  UpdateAllLifecyclePhasesForTest();
+  element_count = GetStyleEngine().StyleForElementCount() - start_count;
+  ASSERT_EQ(1U, element_count);
+  GetElementById("div10")->SetHovered(false);
+  UpdateAllLifecyclePhasesForTest();
+
+  start_count = GetStyleEngine().StyleForElementCount();
+  GetElementById("div12")->SetHovered(true);
+  UpdateAllLifecyclePhasesForTest();
+  element_count = GetStyleEngine().StyleForElementCount() - start_count;
+  ASSERT_EQ(0U, element_count);
+  GetElementById("div12")->SetHovered(false);
+  UpdateAllLifecyclePhasesForTest();
+
+  start_count = GetStyleEngine().StyleForElementCount();
+  GetElementById("div13")->SetHovered(true);
+  UpdateAllLifecyclePhasesForTest();
+  element_count = GetStyleEngine().StyleForElementCount() - start_count;
+  ASSERT_EQ(0U, element_count);
+  GetElementById("div13")->SetHovered(false);
+  UpdateAllLifecyclePhasesForTest();
+}
+
 }  // namespace blink

third_party/blink/renderer/core/css/css_selector.cc

diff --git a/third_party/blink/renderer/core/css/css_selector.cc b/third_party/blink/renderer/core/css/css_selector.cc
index f51f749..3c77159b 100644
--- a/third_party/blink/renderer/core/css/css_selector.cc
+++ b/third_party/blink/renderer/core/css/css_selector.cc
@@ -1042,6 +1042,11 @@
   data_.rare_data_->selector_list_ = std::move(selector_list);
 }
 
+void CSSSelector::SetContainsPseudoInsideHasPseudoClass() {
+  CreateRareData();
+  data_.rare_data_->contains_pseudo_inside_has_pseudo_class_ = true;
+}
+
 static bool ValidateSubSelector(const CSSSelector* selector) {
   switch (selector->Match()) {
     case CSSSelector::kTag:
@@ -1242,7 +1247,8 @@
       serializing_value_(value),
       bits_(),
       attribute_(AnyQName()),
-      argument_(g_null_atom) {}
+      argument_(g_null_atom),
+      contains_pseudo_inside_has_pseudo_class_(false) {}
 
 CSSSelector::RareData::~RareData() = default;
 

third_party/blink/renderer/core/css/css_selector.h

diff --git a/third_party/blink/renderer/core/css/css_selector.h b/third_party/blink/renderer/core/css/css_selector.h
index 7b5efb0d1..5ccf698 100644
--- a/third_party/blink/renderer/core/css/css_selector.h
+++ b/third_party/blink/renderer/core/css/css_selector.h
@@ -343,6 +343,11 @@
   const Vector<AtomicString>* PartNames() const {
     return has_rare_data_ ? data_.rare_data_->part_names_.get() : nullptr;
   }
+  bool ContainsPseudoInsideHasPseudoClass() const {
+    return has_rare_data_
+               ? data_.rare_data_->contains_pseudo_inside_has_pseudo_class_
+               : false;
+  }
 
 #ifndef NDEBUG
   void Show() const;
@@ -355,6 +360,7 @@
   void SetArgument(const AtomicString&);
   void SetSelectorList(std::unique_ptr<CSSSelectorList>);
   void SetPartNames(std::unique_ptr<Vector<AtomicString>>);
+  void SetContainsPseudoInsideHasPseudoClass();
 
   void SetNth(int a, int b);
   bool MatchNth(unsigned count) const;
@@ -475,6 +481,7 @@
         selector_list_;  // Used for :-webkit-any and :not
     std::unique_ptr<Vector<AtomicString>>
         part_names_;  // Used for ::part() selectors.
+    bool contains_pseudo_inside_has_pseudo_class_;  // Used for :has() selectors
 
    private:
     RareData(const AtomicString& value);

third_party/blink/renderer/core/css/parser/css_parser_selector.cc

diff --git a/third_party/blink/renderer/core/css/parser/css_parser_selector.cc b/third_party/blink/renderer/core/css/parser/css_parser_selector.cc
index 362d4fa..737a646 100644
--- a/third_party/blink/renderer/core/css/parser/css_parser_selector.cc
+++ b/third_party/blink/renderer/core/css/parser/css_parser_selector.cc
@@ -58,6 +58,10 @@
   selector_->SetSelectorList(std::move(selector_list));
 }
 
+void CSSParserSelector::SetContainsPseudoInsideHasPseudoClass() {
+  selector_->SetContainsPseudoInsideHasPseudoClass();
+}
+
 void CSSParserSelector::AppendTagHistory(
     CSSSelector::RelationType relation,
     std::unique_ptr<CSSParserSelector> selector) {

third_party/blink/renderer/core/css/parser/css_parser_selector.h

diff --git a/third_party/blink/renderer/core/css/parser/css_parser_selector.h b/third_party/blink/renderer/core/css/parser/css_parser_selector.h
index fff17e1..2e244c65 100644
--- a/third_party/blink/renderer/core/css/parser/css_parser_selector.h
+++ b/third_party/blink/renderer/core/css/parser/css_parser_selector.h
@@ -79,6 +79,7 @@
       Vector<std::unique_ptr<CSSParserSelector>>& selector_vector);
   void SetSelectorList(std::unique_ptr<CSSSelectorList>);
   void SetAtomics(std::unique_ptr<CSSSelectorList>);
+  void SetContainsPseudoInsideHasPseudoClass();
 
   bool IsHostPseudoSelector() const;
 

third_party/blink/renderer/core/css/parser/css_selector_parser.cc

diff --git a/third_party/blink/renderer/core/css/parser/css_selector_parser.cc b/third_party/blink/renderer/core/css/parser/css_selector_parser.cc
index 44345285..ea07170 100644
--- a/third_party/blink/renderer/core/css/parser/css_selector_parser.cc
+++ b/third_party/blink/renderer/core/css/parser/css_selector_parser.cc
@@ -784,6 +784,9 @@
   bool has_arguments = token.GetType() == kFunctionToken;
   selector->UpdatePseudoType(value, *context_, has_arguments, context_->Mode());
 
+  if (UNLIKELY(is_inside_has_argument_))
+    found_pseudo_in_has_argument_ = true;
+
   if (selector->Match() == CSSSelector::kPseudoElement) {
     switch (selector->GetPseudoType()) {
       case CSSSelector::kPseudoBefore:
@@ -877,6 +880,11 @@
       DisallowPseudoElementsScope scope(this);
       base::AutoReset<bool> resist_namespace(&resist_default_namespace_, true);
 
+      base::AutoReset<bool> is_inside_has_argument(&is_inside_has_argument_,
+                                                   true);
+      base::AutoReset<bool> found_pseudo_in_has_argument(
+          &found_pseudo_in_has_argument_, false);
+
       std::unique_ptr<CSSSelectorList> selector_list =
           std::make_unique<CSSSelectorList>();
       *selector_list = ConsumeRelativeSelectorList(block);
@@ -884,6 +892,8 @@
         return nullptr;
 
       selector->SetSelectorList(std::move(selector_list));
+      if (UNLIKELY(found_pseudo_in_has_argument_))
+        selector->SetContainsPseudoInsideHasPseudoClass();
       return selector;
     }
     case CSSSelector::kPseudoNot: {

third_party/blink/renderer/core/css/parser/css_selector_parser.h

diff --git a/third_party/blink/renderer/core/css/parser/css_selector_parser.h b/third_party/blink/renderer/core/css/parser/css_selector_parser.h
index b2047bd..b227d97 100644
--- a/third_party/blink/renderer/core/css/parser/css_selector_parser.h
+++ b/third_party/blink/renderer/core/css/parser/css_selector_parser.h
@@ -150,6 +150,11 @@
   // the default namespace is '*' while this flag is true.
   bool ignore_default_namespace_ = false;
 
+  // The 'found_pseudo_in_has_argument flag is true when we found any pseudo in
+  // ':has()' argument while parsing.
+  bool found_pseudo_in_has_argument_ = false;
+  bool is_inside_has_argument_ = false;
+
   class DisallowPseudoElementsScope {
     STACK_ALLOCATED();
 

third_party/blink/renderer/core/css/resolver/style_resolver.cc

diff --git a/third_party/blink/renderer/core/css/resolver/style_resolver.cc b/third_party/blink/renderer/core/css/resolver/style_resolver.cc
index 147e212..f844341 100644
--- a/third_party/blink/renderer/core/css/resolver/style_resolver.cc
+++ b/third_party/blink/renderer/core/css/resolver/style_resolver.cc
@@ -1528,16 +1528,18 @@
                                     matched_property_cache_inherited_hit, 1);
 
       EInsideLink link_status = state.Style()->InsideLink();
-      bool ancestors_affected_by_has = state.Style()->AncestorsAffectedByHas();
+      unsigned dynamic_restyle_flags_for_has =
+          state.Style()->DynamicRestyleFlagsForHas();
       // If the cache item parent style has identical inherited properties to
       // the current parent style then the resulting style will be identical
       // too. We copy the inherited properties over from the cache and are done.
       state.Style()->InheritFrom(*cached_matched_properties->computed_style);
 
-      // Unfortunately the link status and 'ancestors affected by has' are
+      // Unfortunately the 'link status' and 'dynamic restyle flags for has' are
       // treated like an inherited property. We need to explicitly restore it.
       state.Style()->SetInsideLink(link_status);
-      state.Style()->SetAncestorsAffectedByHas(ancestors_affected_by_has);
+      state.Style()->SetDynamicRestyleFlagsForHas(
+          dynamic_restyle_flags_for_has);
 
       is_inherited_cache_hit = true;
     }

third_party/blink/renderer/core/css/rule_feature_set.cc

diff --git a/third_party/blink/renderer/core/css/rule_feature_set.cc b/third_party/blink/renderer/core/css/rule_feature_set.cc
index 54b096d..2b87434d 100644
--- a/third_party/blink/renderer/core/css/rule_feature_set.cc
+++ b/third_party/blink/renderer/core/css/rule_feature_set.cc
@@ -409,6 +409,7 @@
   ids_in_has_argument_.clear();
   tag_names_in_has_argument_.clear();
   universal_in_has_argument_ = false;
+  pseudos_in_has_argument_.clear();
 
   is_alive_ = false;
 }
@@ -440,6 +441,7 @@
          ids_in_has_argument_ == other.ids_in_has_argument_ &&
          tag_names_in_has_argument_ == other.tag_names_in_has_argument_ &&
          universal_in_has_argument_ == other.universal_in_has_argument_ &&
+         pseudos_in_has_argument_ == other.pseudos_in_has_argument_ &&
          is_alive_ == other.is_alive_;
 }
 
@@ -894,6 +896,10 @@
     tag_names_in_has_argument_.insert(selector.TagQName().LocalName());
     return true;
   }
+  if (selector.Match() == CSSSelector::kPseudoClass) {
+    pseudos_in_has_argument_.insert(selector.GetPseudoType());
+    return true;
+  }
   return false;
 }
 
@@ -1239,6 +1245,8 @@
   for (const auto& tag_name : other.tag_names_in_has_argument_)
     tag_names_in_has_argument_.insert(tag_name);
   universal_in_has_argument_ |= other.universal_in_has_argument_;
+  for (const auto& pseudo_type : other.pseudos_in_has_argument_)
+    pseudos_in_has_argument_.insert(pseudo_type);
 }
 
 void RuleFeatureSet::Clear() {
@@ -1258,6 +1266,7 @@
   ids_in_has_argument_.clear();
   tag_names_in_has_argument_.clear();
   universal_in_has_argument_ = false;
+  pseudos_in_has_argument_.clear();
 }
 
 void RuleFeatureSet::CollectInvalidationSetsForClass(
@@ -1537,6 +1546,15 @@
   return NeedsHasInvalidationForTagName(element.LocalNameForSelectorMatching());
 }
 
+bool RuleFeatureSet::NeedsHasInvalidationForPseudoClass(
+    CSSSelector::PseudoType pseudo_type) const {
+  return pseudos_in_has_argument_.Contains(pseudo_type);
+}
+
+bool RuleFeatureSet::NeedsHasInvalidationForPseudoStateChange() const {
+  return !pseudos_in_has_argument_.IsEmpty();
+}
+
 void RuleFeatureSet::InvalidationSetFeatures::Add(
     const InvalidationSetFeatures& other) {
   classes.AppendVector(other.classes);

third_party/blink/renderer/core/css/rule_feature_set.h

diff --git a/third_party/blink/renderer/core/css/rule_feature_set.h b/third_party/blink/renderer/core/css/rule_feature_set.h
index a280ffb..8835bdbd2 100644
--- a/third_party/blink/renderer/core/css/rule_feature_set.h
+++ b/third_party/blink/renderer/core/css/rule_feature_set.h
@@ -151,6 +151,9 @@
   bool NeedsHasInvalidationForId(const AtomicString& id) const;
   bool NeedsHasInvalidationForTagName(const AtomicString& tag_name) const;
   bool NeedsHasInvalidationForElement(Element&) const;
+  bool NeedsHasInvalidationForPseudoClass(
+      CSSSelector::PseudoType pseudo_type) const;
+  bool NeedsHasInvalidationForPseudoStateChange() const;
 
   bool HasIdsInSelectors() const { return id_invalidation_sets_.size() > 0; }
   bool InvalidatesParts() const { return metadata_.invalidates_parts; }
@@ -204,6 +207,7 @@
               WTF::IntHash<unsigned>,
               WTF::UnsignedWithZeroKeyHashTraits<unsigned>>;
   using ValuesInHasArgument = HashSet<AtomicString>;
+  using PseudosInHasArgument = HashSet<CSSSelector::PseudoType>;
 
   struct FeatureMetadata {
     DISALLOW_NEW();
@@ -490,6 +494,7 @@
   ValuesInHasArgument ids_in_has_argument_;
   ValuesInHasArgument tag_names_in_has_argument_;
   bool universal_in_has_argument_{false};
+  PseudosInHasArgument pseudos_in_has_argument_;
 
   // If true, the RuleFeatureSet is alive and can be used.
   unsigned is_alive_ : 1;

third_party/blink/renderer/core/css/selector_checker.cc

diff --git a/third_party/blink/renderer/core/css/selector_checker.cc b/third_party/blink/renderer/core/css/selector_checker.cc
index 67bca13..3fbba229 100644
--- a/third_party/blink/renderer/core/css/selector_checker.cc
+++ b/third_party/blink/renderer/core/css/selector_checker.cc
@@ -664,6 +664,8 @@
   sub_context.scope = context.scope;
   // sub_context.is_inside_visited_link is false (by default) to disable
   // :visited matching when it is in the :has argument
+  sub_context.is_inside_has_pseudo_class = true;
+  sub_context.pseudo_has_in_rightmost_compound = context.in_rightmost_compound;
 
   DCHECK(context.selector->SelectorList());
   for (const CSSSelector* selector = context.selector->SelectorList()->First();
@@ -1010,19 +1012,38 @@
       }
       return element.IsDragged();
     case CSSSelector::kPseudoFocus:
-      if (mode_ == kResolvingStyle && !context.in_rightmost_compound)
-        element.SetChildrenOrSiblingsAffectedByFocus();
+      if (mode_ == kResolvingStyle) {
+        if (UNLIKELY(context.is_inside_has_pseudo_class)) {
+          if (context.pseudo_has_in_rightmost_compound)
+            element_style_->SetAncestorsAffectedByFocusInHas();
+        } else {
+          if (!context.in_rightmost_compound)
+            element.SetChildrenOrSiblingsAffectedByFocus();
+        }
+      }
       return MatchesFocusPseudoClass(element);
     case CSSSelector::kPseudoFocusVisible:
-      if (mode_ == kResolvingStyle && !context.in_rightmost_compound)
-        element.SetChildrenOrSiblingsAffectedByFocusVisible();
+      if (mode_ == kResolvingStyle) {
+        if (UNLIKELY(context.is_inside_has_pseudo_class)) {
+          if (context.pseudo_has_in_rightmost_compound)
+            element_style_->SetAncestorsAffectedByFocusVisibleInHas();
+        } else {
+          if (!context.in_rightmost_compound)
+            element.SetChildrenOrSiblingsAffectedByFocusVisible();
+        }
+      }
       return MatchesFocusVisiblePseudoClass(element);
     case CSSSelector::kPseudoFocusWithin:
       if (mode_ == kResolvingStyle) {
-        if (context.in_rightmost_compound)
-          element_style_->SetAffectedByFocusWithin();
-        else
-          element.SetChildrenOrSiblingsAffectedByFocusWithin();
+        if (UNLIKELY(context.is_inside_has_pseudo_class)) {
+          if (context.pseudo_has_in_rightmost_compound)
+            element_style_->SetAncestorsAffectedByFocusInHas();
+        } else {
+          if (context.in_rightmost_compound)
+            element_style_->SetAffectedByFocusWithin();
+          else
+            element.SetChildrenOrSiblingsAffectedByFocusWithin();
+        }
       }
       probe::ForcePseudoState(&element, CSSSelector::kPseudoFocusWithin,
                               &force_pseudo_state);
@@ -1031,10 +1052,15 @@
       return element.HasFocusWithin();
     case CSSSelector::kPseudoHover:
       if (mode_ == kResolvingStyle) {
-        if (context.in_rightmost_compound)
-          element_style_->SetAffectedByHover();
-        else
-          element.SetChildrenOrSiblingsAffectedByHover();
+        if (UNLIKELY(context.is_inside_has_pseudo_class)) {
+          if (context.pseudo_has_in_rightmost_compound)
+            element_style_->SetAncestorsAffectedByHoverInHas();
+        } else {
+          if (context.in_rightmost_compound)
+            element_style_->SetAffectedByHover();
+          else
+            element.SetChildrenOrSiblingsAffectedByHover();
+        }
       }
       if (!ShouldMatchHoverOrActive(context))
         return false;
@@ -1045,10 +1071,15 @@
       return element.IsHovered();
     case CSSSelector::kPseudoActive:
       if (mode_ == kResolvingStyle) {
-        if (context.in_rightmost_compound)
-          element_style_->SetAffectedByActive();
-        else
-          element.SetChildrenOrSiblingsAffectedByActive();
+        if (UNLIKELY(context.is_inside_has_pseudo_class)) {
+          if (context.pseudo_has_in_rightmost_compound)
+            element_style_->SetAncestorsAffectedByActiveInHas();
+        } else {
+          if (context.in_rightmost_compound)
+            element_style_->SetAffectedByActive();
+          else
+            element.SetChildrenOrSiblingsAffectedByActive();
+        }
       }
       if (!ShouldMatchHoverOrActive(context))
         return false;
@@ -1257,7 +1288,9 @@
           // the element because the mutation can affect the state of this
           // ':has()' selector.
           element_style_->SetAffectedByHas();
-          element_style_->SetAncestorsAffectedByHas(true);
+          element_style_->SetAncestorsAffectedByHas();
+          if (selector.ContainsPseudoInsideHasPseudoClass())
+            element_style_->SetAffectedByPseudoInHas();
         }
         // TODO(blee@igalia.com) non-terminal ':has() is not supported yet
       }

third_party/blink/renderer/core/css/selector_checker.h

diff --git a/third_party/blink/renderer/core/css/selector_checker.h b/third_party/blink/renderer/core/css/selector_checker.h
index 1b9deca..038dc688 100644
--- a/third_party/blink/renderer/core/css/selector_checker.h
+++ b/third_party/blink/renderer/core/css/selector_checker.h
@@ -122,6 +122,8 @@
     bool in_nested_complex_selector = false;
     bool is_inside_visited_link = false;
     const ContainerNode* relative_leftmost_element = nullptr;
+    bool is_inside_has_pseudo_class = false;
+    bool pseudo_has_in_rightmost_compound = true;
   };
 
   struct MatchResult {

third_party/blink/renderer/core/css/style_engine.cc

diff --git a/third_party/blink/renderer/core/css/style_engine.cc b/third_party/blink/renderer/core/css/style_engine.cc
index 82d98ec..a313721 100644
--- a/third_party/blink/renderer/core/css/style_engine.cc
+++ b/third_party/blink/renderer/core/css/style_engine.cc
@@ -923,11 +923,13 @@
   return !style || style->AncestorsAffectedByHas();
 }
 
-void InvalidateAncestorsAffectedByHas(Element* element) {
+void InvalidateAncestorsAffectedByHas(Element* element,
+                                      bool for_pseudo_change) {
   while (element) {
     const ComputedStyle* style = element->GetComputedStyle();
 
-    if (style && style->AffectedByHas()) {
+    if (style && style->AffectedByHas() &&
+        (!for_pseudo_change || style->AffectedByPseudoInHas())) {
       // TODO(blee@igalia.com) non-terminal ':has() is not supported yet,
       // so we will always invalidate the element marked as 'AffectedByHas'
 
@@ -949,6 +951,14 @@
   }
 }
 
+void InvalidateAncestorsAffectedByHasForPseudoChange(Element* element) {
+  InvalidateAncestorsAffectedByHas(element, true /* for_pseudo_change */);
+}
+
+void InvalidateAncestorsAffectedByHas(Element* element) {
+  InvalidateAncestorsAffectedByHas(element, false /* for_pseudo_change */);
+}
+
 }  // namespace
 
 void StyleEngine::ClassChangedForElement(
@@ -1136,11 +1146,25 @@
 
 void StyleEngine::PseudoStateChangedForElement(
     CSSSelector::PseudoType pseudo_type,
-    Element& element) {
+    Element& element,
+    bool invalidate_descendants_or_siblings,
+    bool invalidate_ancestors) {
+  if (!invalidate_descendants_or_siblings && !invalidate_ancestors)
+    return;
+
   if (ShouldSkipInvalidationFor(element))
     return;
-  if (IsSubtreeAndSiblingsStyleDirty(element))
+
+  if (invalidate_ancestors && RuntimeEnabledFeatures::CSSPseudoHasEnabled() &&
+      PossiblyAffectingHasState(element)) {
+    if (GetRuleFeatureSet().NeedsHasInvalidationForPseudoClass(pseudo_type))
+      InvalidateAncestorsAffectedByHasForPseudoChange(element.parentElement());
+  }
+
+  if (!invalidate_descendants_or_siblings ||
+      IsSubtreeAndSiblingsStyleDirty(element)) {
     return;
+  }
 
   InvalidationLists invalidation_lists;
   GetRuleFeatureSet().CollectInvalidationSetsForPseudoClass(
@@ -1352,8 +1376,12 @@
   if (ShouldSkipInvalidationFor(*parent))
     return;
 
-  if (GetRuleFeatureSet().NeedsHasInvalidationForElement(element))
+  const RuleFeatureSet& features = GetRuleFeatureSet();
+
+  if (features.NeedsHasInvalidationForElement(element))
     InvalidateAncestorsAffectedByHas(parent);
+  else if (features.NeedsHasInvalidationForPseudoStateChange())
+    InvalidateAncestorsAffectedByHasForPseudoChange(parent);
 }
 
 void StyleEngine::SubtreeInsertedOrRemoved(Element* parent,
@@ -1372,6 +1400,8 @@
       return;
     }
   }
+  if (features.NeedsHasInvalidationForPseudoStateChange())
+    InvalidateAncestorsAffectedByHasForPseudoChange(parent);
 }
 
 void StyleEngine::InvalidateStyle() {

third_party/blink/renderer/core/css/style_engine.h

diff --git a/third_party/blink/renderer/core/css/style_engine.h b/third_party/blink/renderer/core/css/style_engine.h
index 75c16dbd..7374b1c3 100644
--- a/third_party/blink/renderer/core/css/style_engine.h
+++ b/third_party/blink/renderer/core/css/style_engine.h
@@ -367,7 +367,10 @@
   void IdChangedForElement(const AtomicString& old_id,
                            const AtomicString& new_id,
                            Element&);
-  void PseudoStateChangedForElement(CSSSelector::PseudoType, Element&);
+  void PseudoStateChangedForElement(CSSSelector::PseudoType,
+                                    Element&,
+                                    bool invalidate_descendants_or_siblings,
+                                    bool invalidate_ancestors);
   void PartChangedForElement(Element&);
   void ExportpartsChangedForElement(Element&);
 

third_party/blink/renderer/core/css/style_engine_test.cc

diff --git a/third_party/blink/renderer/core/css/style_engine_test.cc b/third_party/blink/renderer/core/css/style_engine_test.cc
index dd3e3042a..b8977c0 100644
--- a/third_party/blink/renderer/core/css/style_engine_test.cc
+++ b/third_party/blink/renderer/core/css/style_engine_test.cc
@@ -5241,4 +5241,51 @@
   ASSERT_EQ(1U, element_count);
 }
 
+TEST_F(StyleEngineTest,
+       HasPseudoClassInvalidationInsertionRemovalWithPseudoInHas) {
+  GetDocument().body()->setInnerHTML(R"HTML(
+    <style>
+      .a:has(.b:focus) { background-color: lime; }
+      .c:has(.d) { background-color: green; }
+    </style>
+    <div id=div1>
+      <div id=div2 class='a'></div>
+      <div id=div3 class='c'></div>
+    </div>
+  )HTML");
+
+  UpdateAllLifecyclePhases();
+
+  unsigned start_count = GetStyleEngine().StyleForElementCount();
+  auto* div4 = MakeGarbageCollected<HTMLDivElement>(GetDocument());
+  div4->setAttribute(html_names::kIdAttr, "div4");
+  GetDocument().getElementById("div2")->AppendChild(div4);
+  UpdateAllLifecyclePhases();
+  unsigned element_count =
+      GetStyleEngine().StyleForElementCount() - start_count;
+  ASSERT_EQ(2U, element_count);
+
+  start_count = GetStyleEngine().StyleForElementCount();
+  auto* div5 = MakeGarbageCollected<HTMLDivElement>(GetDocument());
+  div5->setAttribute(html_names::kIdAttr, "div5");
+  GetDocument().getElementById("div3")->AppendChild(div5);
+  UpdateAllLifecyclePhases();
+  element_count = GetStyleEngine().StyleForElementCount() - start_count;
+  ASSERT_EQ(1U, element_count);
+
+  start_count = GetStyleEngine().StyleForElementCount();
+  GetDocument().getElementById("div2")->RemoveChild(
+      GetDocument().getElementById("div4"));
+  UpdateAllLifecyclePhases();
+  element_count = GetStyleEngine().StyleForElementCount() - start_count;
+  ASSERT_EQ(1U, element_count);
+
+  start_count = GetStyleEngine().StyleForElementCount();
+  GetDocument().getElementById("div3")->RemoveChild(
+      GetDocument().getElementById("div5"));
+  UpdateAllLifecyclePhases();
+  element_count = GetStyleEngine().StyleForElementCount() - start_count;
+  ASSERT_EQ(0U, element_count);
+}
+
 }  // namespace blink

third_party/blink/renderer/core/dom/container_node.cc

diff --git a/third_party/blink/renderer/core/dom/container_node.cc b/third_party/blink/renderer/core/dom/container_node.cc
index fcc7bbb..a69144f 100644
--- a/third_party/blink/renderer/core/dom/container_node.cc
+++ b/third_party/blink/renderer/core/dom/container_node.cc
@@ -1111,8 +1111,7 @@
       StyleChangeReasonForTracing::CreateWithExtraData(
           style_change_reason::kPseudoClass, style_change_extra_data::g_focus));
 
-  auto* this_element = DynamicTo<Element>(this);
-  if (this_element && this_element->ChildrenOrSiblingsAffectedByFocus())
+  if (auto* this_element = DynamicTo<Element>(this))
     this_element->PseudoStateChanged(CSSSelector::kPseudoFocus);
 
   InvalidateIfHasEffectiveAppearance();
@@ -1132,8 +1131,7 @@
                           style_change_reason::kPseudoClass,
                           style_change_extra_data::g_focus_visible));
 
-  auto* this_element = DynamicTo<Element>(this);
-  if (this_element && this_element->ChildrenOrSiblingsAffectedByFocusVisible())
+  if (auto* this_element = DynamicTo<Element>(this))
     this_element->PseudoStateChanged(CSSSelector::kPseudoFocusVisible);
 }
 
@@ -1148,8 +1146,7 @@
                             style_change_reason::kPseudoClass,
                             style_change_extra_data::g_focus_within));
   }
-  auto* this_element = DynamicTo<Element>(this);
-  if (this_element && this_element->ChildrenOrSiblingsAffectedByFocusWithin())
+  if (auto* this_element = DynamicTo<Element>(this))
     this_element->PseudoStateChanged(CSSSelector::kPseudoFocusWithin);
 }
 
@@ -1185,35 +1182,36 @@
 
   // If :focus sets display: none, we lose focus but still need to recalc our
   // style.
-  if (this_element && this_element->ChildrenOrSiblingsAffectedByFocus()) {
-    this_element->PseudoStateChanged(CSSSelector::kPseudoFocus);
-  } else {
+  if (!this_element || !this_element->ChildrenOrSiblingsAffectedByFocus()) {
     SetNeedsStyleRecalc(kLocalStyleChange,
                         StyleChangeReasonForTracing::CreateWithExtraData(
                             style_change_reason::kPseudoClass,
                             style_change_extra_data::g_focus));
   }
+  if (this_element)
+    this_element->PseudoStateChanged(CSSSelector::kPseudoFocus);
 
   if (RuntimeEnabledFeatures::CSSFocusVisibleEnabled()) {
-    if (this_element &&
-        this_element->ChildrenOrSiblingsAffectedByFocusVisible()) {
-      this_element->PseudoStateChanged(CSSSelector::kPseudoFocusVisible);
-    } else {
+    if (!this_element ||
+        !this_element->ChildrenOrSiblingsAffectedByFocusVisible()) {
       SetNeedsStyleRecalc(kLocalStyleChange,
                           StyleChangeReasonForTracing::CreateWithExtraData(
                               style_change_reason::kPseudoClass,
                               style_change_extra_data::g_focus_visible));
     }
+    if (this_element)
+      this_element->PseudoStateChanged(CSSSelector::kPseudoFocusVisible);
   }
 
-  if (this_element && this_element->ChildrenOrSiblingsAffectedByFocusWithin()) {
-    this_element->PseudoStateChanged(CSSSelector::kPseudoFocusWithin);
-  } else {
+  if (!this_element ||
+      !this_element->ChildrenOrSiblingsAffectedByFocusWithin()) {
     SetNeedsStyleRecalc(kLocalStyleChange,
                         StyleChangeReasonForTracing::CreateWithExtraData(
                             style_change_reason::kPseudoClass,
                             style_change_extra_data::g_focus_within));
   }
+  if (this_element)
+    this_element->PseudoStateChanged(CSSSelector::kPseudoFocusWithin);
 }
 
 void ContainerNode::SetHasFocusWithinUpToAncestor(bool flag, Node* ancestor) {

third_party/blink/renderer/core/dom/document.cc

diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
index b975beb2d..2b42649a 100644
--- a/third_party/blink/renderer/core/dom/document.cc
+++ b/third_party/blink/renderer/core/dom/document.cc
@@ -7496,16 +7496,16 @@
   auto& set = UserActionElements();
   if (pseudo == ":focus") {
     set.SetFocused(&element, matches);
-    element.PseudoStateChanged(CSSSelector::kPseudoFocus);
+    element.PseudoStateChangedForTesting(CSSSelector::kPseudoFocus);
   } else if (pseudo == ":focus-within") {
     set.SetHasFocusWithin(&element, matches);
-    element.PseudoStateChanged(CSSSelector::kPseudoFocusWithin);
+    element.PseudoStateChangedForTesting(CSSSelector::kPseudoFocusWithin);
   } else if (pseudo == ":active") {
     set.SetActive(&element, matches);
-    element.PseudoStateChanged(CSSSelector::kPseudoActive);
+    element.PseudoStateChangedForTesting(CSSSelector::kPseudoActive);
   } else if (pseudo == ":hover") {
     set.SetHovered(&element, matches);
-    element.PseudoStateChanged(CSSSelector::kPseudoHover);
+    element.PseudoStateChangedForTesting(CSSSelector::kPseudoHover);
   } else {
     return false;
   }

third_party/blink/renderer/core/dom/element.cc

diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/renderer/core/dom/element.cc
index fd954d3..f9484f2 100644
--- a/third_party/blink/renderer/core/dom/element.cc
+++ b/third_party/blink/renderer/core/dom/element.cc
@@ -3696,14 +3696,72 @@
   InlineStyleChanged();
 }
 
+struct Element::AffectedByPseudoStateChange {
+  bool children_or_siblings{true};
+  bool ancestors{false};
+
+  AffectedByPseudoStateChange(CSSSelector::PseudoType pseudo_type,
+                              Element& element) {
+    switch (pseudo_type) {
+      case CSSSelector::kPseudoFocus:
+        children_or_siblings = element.ChildrenOrSiblingsAffectedByFocus();
+        if (auto* style = element.GetComputedStyle())
+          ancestors = style->AncestorsAffectedByFocusInHas();
+        break;
+      case CSSSelector::kPseudoFocusVisible:
+        children_or_siblings =
+            element.ChildrenOrSiblingsAffectedByFocusVisible();
+        if (auto* style = element.GetComputedStyle())
+          ancestors = style->AncestorsAffectedByFocusVisibleInHas();
+        break;
+      case CSSSelector::kPseudoFocusWithin:
+        children_or_siblings =
+            element.ChildrenOrSiblingsAffectedByFocusWithin();
+        if (auto* style = element.GetComputedStyle())
+          ancestors = style->AncestorsAffectedByFocusInHas();
+        break;
+      case CSSSelector::kPseudoHover:
+        children_or_siblings = element.ChildrenOrSiblingsAffectedByHover();
+        if (auto* style = element.GetComputedStyle())
+          ancestors = style->AncestorsAffectedByHoverInHas();
+        break;
+      case CSSSelector::kPseudoActive:
+        children_or_siblings = element.ChildrenOrSiblingsAffectedByActive();
+        if (auto* style = element.GetComputedStyle())
+          ancestors = style->AncestorsAffectedByActiveInHas();
+        break;
+      case CSSSelector::kPseudoChecked:
+      case CSSSelector::kPseudoIndeterminate:
+        ancestors = true;
+        break;
+      default:
+        break;
+    }
+  }
+
+  AffectedByPseudoStateChange() : ancestors(true) {}  // For testing
+};
+
 void Element::PseudoStateChanged(CSSSelector::PseudoType pseudo) {
+  PseudoStateChanged(pseudo, AffectedByPseudoStateChange(pseudo, *this));
+}
+
+void Element::PseudoStateChangedForTesting(CSSSelector::PseudoType pseudo) {
+  PseudoStateChanged(pseudo, AffectedByPseudoStateChange());
+}
+
+void Element::PseudoStateChanged(
+    CSSSelector::PseudoType pseudo,
+    AffectedByPseudoStateChange&& affected_by_pseudo) {
   // We can't schedule invaliation sets from inside style recalc otherwise
   // we'd never process them.
   // TODO(esprehn): Make this an ASSERT and fix places that call into this
   // like HTMLSelectElement.
   if (GetDocument().InStyleRecalc())
     return;
-  GetDocument().GetStyleEngine().PseudoStateChangedForElement(pseudo, *this);
+  GetDocument().GetStyleEngine().PseudoStateChangedForElement(
+      pseudo, *this, affected_by_pseudo.children_or_siblings,
+      affected_by_pseudo.ancestors);
 }
 
 void Element::SetAnimationStyleChange(bool animation_style_change) {
@@ -6904,8 +6962,7 @@
                             style_change_reason::kPseudoClass,
                             style_change_extra_data::g_hover));
   }
-  if (ChildrenOrSiblingsAffectedByHover())
-    PseudoStateChanged(CSSSelector::kPseudoHover);
+  PseudoStateChanged(CSSSelector::kPseudoHover);
 
   InvalidateIfHasEffectiveAppearance();
 }
@@ -6917,14 +6974,13 @@
   GetDocument().UserActionElements().SetActive(this, active);
 
   if (!GetLayoutObject()) {
-    if (ChildrenOrSiblingsAffectedByActive()) {
-      PseudoStateChanged(CSSSelector::kPseudoActive);
-    } else {
+    if (!ChildrenOrSiblingsAffectedByActive()) {
       SetNeedsStyleRecalc(kLocalStyleChange,
                           StyleChangeReasonForTracing::CreateWithExtraData(
                               style_change_reason::kPseudoClass,
                               style_change_extra_data::g_active));
     }
+    PseudoStateChanged(CSSSelector::kPseudoActive);
     return;
   }
 
@@ -6938,8 +6994,7 @@
                             style_change_reason::kPseudoClass,
                             style_change_extra_data::g_active));
   }
-  if (ChildrenOrSiblingsAffectedByActive())
-    PseudoStateChanged(CSSSelector::kPseudoActive);
+  PseudoStateChanged(CSSSelector::kPseudoActive);
 
   if (!IsDisabledFormControl())
     InvalidateIfHasEffectiveAppearance();

third_party/blink/renderer/core/dom/element.h

diff --git a/third_party/blink/renderer/core/dom/element.h b/third_party/blink/renderer/core/dom/element.h
index 2348b8e..5a84f18 100644
--- a/third_party/blink/renderer/core/dom/element.h
+++ b/third_party/blink/renderer/core/dom/element.h
@@ -571,6 +571,7 @@
   void RebuildLayoutTree(WhitespaceAttacher&);
   void HandleSubtreeModifications();
   void PseudoStateChanged(CSSSelector::PseudoType);
+  void PseudoStateChangedForTesting(CSSSelector::PseudoType);
   void SetAnimationStyleChange(bool);
   void SetNeedsAnimationStyleRecalc();
 
@@ -1119,6 +1120,7 @@
 
  private:
   friend class AXObject;
+  struct AffectedByPseudoStateChange;
 
   void ScrollLayoutBoxBy(const ScrollToOptions*);
   void ScrollLayoutBoxTo(const ScrollToOptions*);
@@ -1405,6 +1407,9 @@
 
   DisplayLockContext* GetDisplayLockContextFromRareData() const;
 
+  void PseudoStateChanged(CSSSelector::PseudoType pseudo,
+                          AffectedByPseudoStateChange&&);
+
   Member<ElementData> element_data_;
 };
 

third_party/blink/renderer/core/html/forms/html_select_menu_element.cc

diff --git a/third_party/blink/renderer/core/html/forms/html_select_menu_element.cc b/third_party/blink/renderer/core/html/forms/html_select_menu_element.cc
index 78769a5..c378f4e 100644
--- a/third_party/blink/renderer/core/html/forms/html_select_menu_element.cc
+++ b/third_party/blink/renderer/core/html/forms/html_select_menu_element.cc
@@ -40,7 +40,6 @@
                         const QualifiedName& name,
                         const AtomicString& old_value,
                         const AtomicString& new_value) final;
-  void DidMoveTreeToNewDocument(const Node& root) final;
 
   void Trace(Visitor* visitor) const override;
 
@@ -124,12 +123,6 @@
   }
 }
 
-void HTMLSelectMenuElement::SelectMutationCallback::DidMoveTreeToNewDocument(
-    const Node& root) {
-  if (root == select_)
-    SetDocument(&select_->GetDocument());
-}
-
 template <typename StringType>
 void HTMLSelectMenuElement::SelectMutationCallback::PartInserted(
     const StringType& part_name,
@@ -306,6 +299,11 @@
           this);
 }
 
+void HTMLSelectMenuElement::DidMoveToNewDocument(Document& old_document) {
+  HTMLFormControlElementWithState::DidMoveToNewDocument(old_document);
+  select_mutation_callback_->SetDocument(&GetDocument());
+}
+
 String HTMLSelectMenuElement::value() const {
   if (HTMLOptionElement* option = SelectedOption()) {
     return option->value();
@@ -340,6 +338,7 @@
     if (SelectedOption()) {
       SelectedOption()->focus();
     }
+    selected_option_when_listbox_opened_ = SelectedOption();
   }
 }
 
@@ -349,6 +348,8 @@
       button_part_->focus();
     }
     listbox_part_->hide();
+
+    DispatchInputChangeEventsIfNeeded();
   }
 }
 
@@ -636,6 +637,15 @@
   }
 }
 
+void HTMLSelectMenuElement::DispatchInputChangeEventsIfNeeded() {
+  if (SelectedOption() != selected_option_when_listbox_opened_) {
+    Event* input_event = Event::CreateBubble(event_type_names::kInput);
+    input_event->SetComposed(true);
+    DispatchScopedEvent(*input_event);
+    DispatchScopedEvent(*Event::CreateBubble(event_type_names::kChange));
+  }
+}
+
 void HTMLSelectMenuElement::OptionPartInserted(
     HTMLOptionElement* new_option_part) {
   if (!IsValidOptionPart(new_option_part, /*show_warning=*/true)) {
@@ -939,6 +949,7 @@
   visitor->Trace(button_slot_);
   visitor->Trace(listbox_slot_);
   visitor->Trace(selected_option_);
+  visitor->Trace(selected_option_when_listbox_opened_);
   HTMLFormControlElementWithState::Trace(visitor);
 }
 

third_party/blink/renderer/core/html/forms/html_select_menu_element.h

diff --git a/third_party/blink/renderer/core/html/forms/html_select_menu_element.h b/third_party/blink/renderer/core/html/forms/html_select_menu_element.h
index 90a805cd..d860dca5 100644
--- a/third_party/blink/renderer/core/html/forms/html_select_menu_element.h
+++ b/third_party/blink/renderer/core/html/forms/html_select_menu_element.h
@@ -57,6 +57,7 @@
   class SelectMutationCallback;
 
   void DidAddUserAgentShadowRoot(ShadowRoot&) override;
+  void DidMoveToNewDocument(Document& old_document) override;
   void OpenListbox();
   void CloseListbox();
 
@@ -85,6 +86,7 @@
   void OptionPartInserted(HTMLOptionElement*);
   void OptionPartRemoved(HTMLOptionElement*);
   void ResetOptionParts();
+  void DispatchInputChangeEventsIfNeeded();
 
   bool IsValidButtonPart(const Node* node, bool show_warning) const;
   bool IsValidListboxPart(const Node* node, bool show_warning) const;
@@ -151,6 +153,7 @@
   Member<HTMLSlotElement> button_slot_;
   Member<HTMLSlotElement> listbox_slot_;
   Member<HTMLOptionElement> selected_option_;
+  Member<HTMLOptionElement> selected_option_when_listbox_opened_;
 };
 
 }  // namespace blink

third_party/blink/renderer/core/layout/ng/flex/ng_flex_layout_algorithm.cc

diff --git a/third_party/blink/renderer/core/layout/ng/flex/ng_flex_layout_algorithm.cc b/third_party/blink/renderer/core/layout/ng/flex/ng_flex_layout_algorithm.cc
index e67752d..de1c280 100644
--- a/third_party/blink/renderer/core/layout/ng/flex/ng_flex_layout_algorithm.cc
+++ b/third_party/blink/renderer/core/layout/ng/flex/ng_flex_layout_algorithm.cc
@@ -1173,21 +1173,7 @@
     wtf_size_t flex_line_idx = entry.flex_line_idx;
     NGFlexLine& line_output = (*flex_line_outputs)[flex_line_idx];
     const NGBreakToken* item_break_token = entry.token;
-
-    const NGEarlyBreak* early_break_in_child = nullptr;
-    if (UNLIKELY(early_break_)) {
-      if (IsEarlyBreakTarget(*early_break_, container_builder_,
-                             flex_item->ng_input_node)) {
-        container_builder_.AddBreakBeforeChild(flex_item->ng_input_node,
-                                               kBreakAppealPerfect,
-                                               /* is_forced_break */ false);
-        ConsumeRemainingFragmentainerSpace(line_output);
-        return NGLayoutResult::kSuccess;
-      } else {
-        early_break_in_child =
-            EnterEarlyBreakInChild(flex_item->ng_input_node, *early_break_);
-      }
-    }
+    bool last_item_in_line = flex_item_idx == line_output.line_items.size() - 1;
 
     // A child break in a parallel flow doesn't affect whether we should
     // break here or not.
@@ -1203,6 +1189,7 @@
 
     LogicalOffset offset = flex_item->offset.ToLogicalOffset(is_column_);
 
+    // TODO(almaher): Margins should be preserved at forced breaks.
     if (item_break_token) {
       offset.block_offset = LayoutUnit();
     } else if (IsResumingLayout(BreakToken())) {
@@ -1213,6 +1200,21 @@
       offset.block_offset = updated_block_offset;
     }
 
+    const NGEarlyBreak* early_break_in_child = nullptr;
+    if (UNLIKELY(early_break_)) {
+      if (IsEarlyBreakTarget(*early_break_, container_builder_,
+                             flex_item->ng_input_node)) {
+        container_builder_.AddBreakBeforeChild(flex_item->ng_input_node,
+                                               kBreakAppealPerfect,
+                                               /* is_forced_break */ false);
+        ConsumeRemainingFragmentainerSpace(offset, flex_item);
+        return NGLayoutResult::kSuccess;
+      } else {
+        early_break_in_child =
+            EnterEarlyBreakInChild(flex_item->ng_input_node, *early_break_);
+      }
+    }
+
     absl::optional<LayoutUnit> line_cross_size_for_stretch =
         DoesItemStretch(flex_item->ng_input_node)
             ? absl::optional<LayoutUnit>(line_output.line_cross_size)
@@ -1247,13 +1249,11 @@
     }
 
     if (break_status == NGBreakStatus::kBrokeBefore) {
-      ConsumeRemainingFragmentainerSpace(line_output);
+      ConsumeRemainingFragmentainerSpace(offset, flex_item);
       // If we broke before an item in a row container, make sure that all
       // items in that row have been processed before returning.
-      if (!is_horizontal_flow_ ||
-          flex_item_idx == line_output.line_items.size() - 1) {
+      if (!is_horizontal_flow_ || last_item_in_line)
         return NGLayoutResult::kSuccess;
-      }
       last_line_idx_to_process_first_child_ = flex_line_idx;
       continue;
     }
@@ -1270,14 +1270,21 @@
 
     // This item may have expanded due to fragmentation. Record how large the
     // shift was (if any). Only do this if the item has completed layout.
-    if (min_block_size_should_encompass_intrinsic_size &&
-        !physical_fragment.BreakToken() &&
+    if (!physical_fragment.BreakToken() &&
         flex_item->total_remaining_block_size < LayoutUnit()) {
-      // TODO(almaher): Special logic will likely be needed for row
-      // expansion.
       LayoutUnit expansion = -flex_item->total_remaining_block_size;
-      line_output.item_offset_adjustment += expansion;
-      total_intrinsic_block_size_ += expansion;
+      if (is_horizontal_flow_) {
+        // Adjust the offset of the next row by the largest item expansion in
+        // the current row.
+        if (flex_line_idx < flex_line_outputs->size() - 1) {
+          LayoutUnit& adjustment_for_next_line =
+              (*flex_line_outputs)[flex_line_idx + 1].item_offset_adjustment;
+          adjustment_for_next_line =
+              std::max(adjustment_for_next_line, expansion);
+        }
+      } else {
+        line_output.item_offset_adjustment += expansion;
+      }
     }
 
     // TODO(almaher): What to do in the case where the line extends past
@@ -1294,9 +1301,24 @@
       PropagateBaselineFromChild(flex_item->Style(), fragment,
                                  offset.block_offset, &fallback_baseline);
     }
-    if (!has_processed_first_line_ &&
-        flex_item_idx == line_output.line_items.size() - 1) {
-      has_processed_first_line_ = true;
+    if (last_item_in_line) {
+      if (!has_processed_first_line_)
+        has_processed_first_line_ = true;
+
+      if (!physical_fragment.BreakToken()) {
+        if (flex_line_idx < flex_line_outputs->size() - 1) {
+          if (is_horizontal_flow_) {
+            // Add the offset adjustment of the current row to the next row so
+            // that its items can also be adjusted by previous item expansion.
+            // Only do this when the current row has completed layout.
+            (*flex_line_outputs)[flex_line_idx + 1].item_offset_adjustment +=
+                line_output.item_offset_adjustment;
+          }
+        } else {
+          DCHECK_EQ(flex_line_idx, flex_line_outputs->size() - 1);
+          total_intrinsic_block_size_ += line_output.item_offset_adjustment;
+        }
+      }
     }
     last_line_idx_to_process_first_child_ = flex_line_idx;
   }
@@ -1514,21 +1536,25 @@
   return MinMaxSizesResult(sizes, depends_on_block_constraints);
 }
 
-LayoutUnit NGFlexLayoutAlgorithm::FragmentainerSpaceAvailable() const {
-  return (FragmentainerSpaceAtBfcStart(ConstraintSpace()) -
-          intrinsic_block_size_)
+LayoutUnit NGFlexLayoutAlgorithm::FragmentainerSpaceAvailable(
+    LayoutUnit block_offset) const {
+  return (FragmentainerSpaceAtBfcStart(ConstraintSpace()) - block_offset)
       .ClampNegativeToZero();
 }
 
 void NGFlexLayoutAlgorithm::ConsumeRemainingFragmentainerSpace(
-    NGFlexLine& flex_line) {
+    LogicalOffset item_offset,
+    NGFlexItem* flex_item) {
   if (ConstraintSpace().HasKnownFragmentainerBlockSize()) {
     // The remaining part of the fragmentainer (the unusable space for child
     // content, due to the break) should still be occupied by this container.
-    LayoutUnit expansion = FragmentainerSpaceAvailable();
-    intrinsic_block_size_ += expansion;
-    total_intrinsic_block_size_ += expansion;
-    flex_line.item_offset_adjustment += expansion;
+    LayoutUnit content_expansion =
+        FragmentainerSpaceAvailable(intrinsic_block_size_);
+    intrinsic_block_size_ += content_expansion;
+
+    LayoutUnit item_expansion =
+        FragmentainerSpaceAvailable(item_offset.block_offset);
+    flex_item->total_remaining_block_size -= item_expansion;
   }
 }
 

third_party/blink/renderer/core/layout/ng/flex/ng_flex_layout_algorithm.h

diff --git a/third_party/blink/renderer/core/layout/ng/flex/ng_flex_layout_algorithm.h b/third_party/blink/renderer/core/layout/ng/flex/ng_flex_layout_algorithm.h
index f160420..d7a52009 100644
--- a/third_party/blink/renderer/core/layout/ng/flex/ng_flex_layout_algorithm.h
+++ b/third_party/blink/renderer/core/layout/ng/flex/ng_flex_layout_algorithm.h
@@ -101,13 +101,14 @@
 
   // Return the amount of block space available in the current fragmentainer
   // for the node being laid out by this algorithm.
-  LayoutUnit FragmentainerSpaceAvailable() const;
+  LayoutUnit FragmentainerSpaceAvailable(LayoutUnit block_offset) const;
 
   // Consume all remaining fragmentainer space. This happens when we decide to
   // break before a child.
   //
   // https://www.w3.org/TR/css-break-3/#box-splitting
-  void ConsumeRemainingFragmentainerSpace(NGFlexLine& flex_line);
+  void ConsumeRemainingFragmentainerSpace(LogicalOffset item_offset,
+                                          NGFlexItem* flex_item);
 
 #if DCHECK_IS_ON()
   void CheckFlexLines(const Vector<NGFlexLine>& flex_line_outputs) const;

third_party/blink/renderer/core/layout/ng/flex/ng_flex_line.h

diff --git a/third_party/blink/renderer/core/layout/ng/flex/ng_flex_line.h b/third_party/blink/renderer/core/layout/ng/flex/ng_flex_line.h
index 261190e..13f97d3 100644
--- a/third_party/blink/renderer/core/layout/ng/flex/ng_flex_line.h
+++ b/third_party/blink/renderer/core/layout/ng/flex/ng_flex_line.h
@@ -30,7 +30,6 @@
   explicit NGFlexLine(wtf_size_t num_items) : line_items(num_items) {}
 
   LayoutUnit line_cross_size;
-  // Note: This is only used by column flex containers.
   LayoutUnit item_offset_adjustment;
   Vector<NGFlexItem> line_items;
 };

third_party/blink/renderer/core/style/computed_style.h

diff --git a/third_party/blink/renderer/core/style/computed_style.h b/third_party/blink/renderer/core/style/computed_style.h
index c38925b..fc4a2ced 100644
--- a/third_party/blink/renderer/core/style/computed_style.h
+++ b/third_party/blink/renderer/core/style/computed_style.h
@@ -390,6 +390,51 @@
                                IsAtShadowBoundary = kNotAtShadowBoundary);
   void CopyNonInheritedFromCached(const ComputedStyle&);
 
+  bool AncestorsAffectedByHas() const {
+    return DynamicRestyleFlagsForHas() & kAncestorsAffectedByHas;
+  }
+
+  void SetAncestorsAffectedByHas() {
+    SetDynamicRestyleFlagsForHas(DynamicRestyleFlagsForHas() |
+                                 kAncestorsAffectedByHas);
+  }
+
+  bool AncestorsAffectedByHoverInHas() const {
+    return DynamicRestyleFlagsForHas() & kAncestorsAffectedByHoverInHas;
+  }
+
+  void SetAncestorsAffectedByHoverInHas() {
+    SetDynamicRestyleFlagsForHas(DynamicRestyleFlagsForHas() |
+                                 kAncestorsAffectedByHoverInHas);
+  }
+
+  bool AncestorsAffectedByActiveInHas() const {
+    return DynamicRestyleFlagsForHas() & kAncestorsAffectedByActiveInHas;
+  }
+
+  void SetAncestorsAffectedByActiveInHas() {
+    SetDynamicRestyleFlagsForHas(DynamicRestyleFlagsForHas() |
+                                 kAncestorsAffectedByActiveInHas);
+  }
+
+  bool AncestorsAffectedByFocusInHas() const {
+    return DynamicRestyleFlagsForHas() & kAncestorsAffectedByFocusInHas;
+  }
+
+  void SetAncestorsAffectedByFocusInHas() {
+    SetDynamicRestyleFlagsForHas(DynamicRestyleFlagsForHas() |
+                                 kAncestorsAffectedByFocusInHas);
+  }
+
+  bool AncestorsAffectedByFocusVisibleInHas() const {
+    return DynamicRestyleFlagsForHas() & kAncestorsAffectedByFocusVisibleInHas;
+  }
+
+  void SetAncestorsAffectedByFocusVisibleInHas() {
+    SetDynamicRestyleFlagsForHas(DynamicRestyleFlagsForHas() |
+                                 kAncestorsAffectedByFocusVisibleInHas);
+  }
+
   PseudoId StyleType() const {
     return static_cast<PseudoId>(StyleTypeInternal());
   }

third_party/blink/renderer/core/style/computed_style_constants.h

diff --git a/third_party/blink/renderer/core/style/computed_style_constants.h b/third_party/blink/renderer/core/style/computed_style_constants.h
index eae5c38e..afd2e75 100644
--- a/third_party/blink/renderer/core/style/computed_style_constants.h
+++ b/third_party/blink/renderer/core/style/computed_style_constants.h
@@ -335,6 +335,20 @@
   kPaintOrderMarkersStrokeFill
 };
 
+// To prevent increasing NodeRareData, the dynamic restyle flags for ':has()'
+// are defined as ComputedStyle extra field flags.
+// Unlike using the DynamicRestyleFlags, the ComputedStyle extra field flag
+// only works for the subject elements. So the filtering with these flags is
+// less targeted then the filtering with DynamicRestyleFlags which works
+// directly for the descendant elements being changed.
+enum EDynamicRestyleFlagsForHas {
+  kAncestorsAffectedByHas = 1 << 0,
+  kAncestorsAffectedByHoverInHas = 1 << 1,
+  kAncestorsAffectedByActiveInHas = 1 << 2,
+  kAncestorsAffectedByFocusInHas = 1 << 3,
+  kAncestorsAffectedByFocusVisibleInHas = 1 << 4,
+};
+
 }  // namespace blink
 
 #endif  // THIRD_PARTY_BLINK_RENDERER_CORE_STYLE_COMPUTED_STYLE_CONSTANTS_H_

third_party/blink/renderer/core/style/computed_style_extra_fields.json5

diff --git a/third_party/blink/renderer/core/style/computed_style_extra_fields.json5 b/third_party/blink/renderer/core/style/computed_style_extra_fields.json5
index f8038ec6..5c9e55e7 100644
--- a/third_party/blink/renderer/core/style/computed_style_extra_fields.json5
+++ b/third_party/blink/renderer/core/style/computed_style_extra_fields.json5
@@ -150,10 +150,19 @@
       custom_compare: true,
     },
     {
-      name: "AncestorsAffectedByHas",
-      field_template: "primitive",
+      name: "AffectedByPseudoInHas",
+      field_template: "monotonic_flag",
       default_value: "false",
-      type_name: "bool",
+      custom_copy: true,
+      custom_compare: true,
+    },
+    {
+      name: "DynamicRestyleFlagsForHas",
+      field_template: "primitive",
+      field_group: "*",
+      field_size: 5,
+      default_value: "0",
+      type_name: "unsigned",
       inherited: true,
     },
     // A non-inherited property references a variable or @apply is used

third_party/blink/renderer/modules/webgpu/OWNERS

diff --git a/third_party/blink/renderer/modules/webgpu/OWNERS b/third_party/blink/renderer/modules/webgpu/OWNERS
index 65bf048..a6c6874 100644
--- a/third_party/blink/renderer/modules/webgpu/OWNERS
+++ b/third_party/blink/renderer/modules/webgpu/OWNERS
@@ -1,4 +1,6 @@
 cwallez@chromium.org
 kainino@chromium.org
 enga@chromium.org
-kbr@chromium.org
+bajones@chromium.org
+
+kbr@chromium.org # backup reviewer

third_party/blink/renderer/platform/scheduler/common/idle_helper.cc

diff --git a/third_party/blink/renderer/platform/scheduler/common/idle_helper.cc b/third_party/blink/renderer/platform/scheduler/common/idle_helper.cc
index 74ae47d..94ef527 100644
--- a/third_party/blink/renderer/platform/scheduler/common/idle_helper.cc
+++ b/third_party/blink/renderer/platform/scheduler/common/idle_helper.cc
@@ -43,7 +43,7 @@
   idle_task_runner_ = base::MakeRefCounted<SingleThreadIdleTaskRunner>(
       idle_queue_->CreateTaskRunner(
           static_cast<int>(TaskType::kMainThreadTaskQueueIdle)),
-      this);
+      helper_->ControlTaskRunner(), this);
 
   // This fence will block any idle tasks from running.
   idle_queue_->InsertFence(TaskQueue::InsertFencePosition::kBeginningOfTime);
@@ -70,7 +70,6 @@
 IdleHelper::Delegate::~Delegate() = default;
 
 scoped_refptr<SingleThreadIdleTaskRunner> IdleHelper::IdleTaskRunner() {
-  helper_->CheckOnValidThread();
   return idle_task_runner_;
 }
 

third_party/blink/renderer/platform/scheduler/common/idle_helper_unittest.cc

diff --git a/third_party/blink/renderer/platform/scheduler/common/idle_helper_unittest.cc b/third_party/blink/renderer/platform/scheduler/common/idle_helper_unittest.cc
index 752f74a..332e690 100644
--- a/third_party/blink/renderer/platform/scheduler/common/idle_helper_unittest.cc
+++ b/third_party/blink/renderer/platform/scheduler/common/idle_helper_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "third_party/blink/renderer/platform/scheduler/common/idle_helper.h"
 
+#include <memory>
 #include <utility>
 
 #include "base/bind.h"
@@ -15,10 +16,17 @@
 #include "base/task/sequence_manager/time_domain.h"
 #include "base/task/single_thread_task_runner.h"
 #include "base/test/test_mock_time_task_runner.h"
+#include "base/time/time.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/blink/public/platform/platform.h"
 #include "third_party/blink/renderer/platform/scheduler/common/scheduler_helper.h"
+#include "third_party/blink/renderer/platform/scheduler/common/single_thread_idle_task_runner.h"
+#include "third_party/blink/renderer/platform/scheduler/public/post_cross_thread_task.h"
+#include "third_party/blink/renderer/platform/scheduler/public/thread.h"
 #include "third_party/blink/renderer/platform/scheduler/worker/non_main_thread_scheduler_helper.h"
+#include "third_party/blink/renderer/platform/wtf/cross_thread_functional.h"
+#include "third_party/blink/renderer/platform/wtf/functional.h"
 #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
 #include "third_party/blink/renderer/platform/wtf/vector.h"
 
@@ -68,7 +76,9 @@
                   base::TimeTicks* deadline_out,
                   base::TimeTicks deadline) {
   (*run_count)++;
-  *deadline_out = deadline;
+  if (deadline_out) {
+    *deadline_out = deadline;
+  }
 }
 
 int g_max_idle_task_reposts = 2;
@@ -1083,6 +1093,117 @@
   EXPECT_EQ(expected_deadline, deadline_in_task);
 }
 
+class MultiThreadedIdleHelperTest : public IdleHelperTest {
+ public:
+  void PostIdleTaskFromNewThread(int* run_count) {
+    PostDelayedIdleTaskFromNewThread(base::TimeDelta(), run_count);
+  }
+
+  void PostDelayedIdleTaskFromNewThread(base::TimeDelta delay, int* run_count) {
+    std::unique_ptr<Thread> thread = Platform::Current()->CreateThread(
+        ThreadCreationParams(ThreadType::kTestThread)
+            .SetThreadNameForTest("TestBackgroundThread"));
+    PostCrossThreadTask(
+        *thread->GetTaskRunner(), FROM_HERE,
+        CrossThreadBindOnce(&PostIdleTaskFromBackgroundThread,
+                            idle_task_runner_, delay,
+                            WTF::CrossThreadUnretained(run_count)));
+    thread.reset();
+  }
+
+ protected:
+  static void PostIdleTaskFromBackgroundThread(
+      scoped_refptr<SingleThreadIdleTaskRunner> idle_task_runner,
+      base::TimeDelta delay,
+      int* run_count) {
+    auto callback = ConvertToBaseOnceCallback(CrossThreadBindOnce(
+        &IdleTestTask, WTF::CrossThreadUnretained(run_count), nullptr));
+    if (delay.is_zero()) {
+      idle_task_runner->PostIdleTask(FROM_HERE, std::move(callback));
+    } else {
+      idle_task_runner->PostDelayedIdleTask(FROM_HERE, delay,
+                                            std::move(callback));
+    }
+  }
+};
+
+TEST_F(MultiThreadedIdleHelperTest, IdleTasksFromNonMainThreads) {
+  int run_count = 0;
+
+  test_task_runner_->AdvanceMockTickClock(base::Milliseconds(100));
+
+  PostIdleTaskFromNewThread(&run_count);
+  PostIdleTaskFromNewThread(&run_count);
+  PostIdleTaskFromNewThread(&run_count);
+
+  EXPECT_EQ(3u, idle_queue()->GetNumberOfPendingTasks());
+  test_task_runner_->RunUntilIdle();
+  EXPECT_EQ(0, run_count);
+
+  idle_helper_->StartIdlePeriod(
+      IdleHelper::IdlePeriodState::kInShortIdlePeriod,
+      test_task_runner_->NowTicks(),
+      test_task_runner_->NowTicks() + base::Milliseconds(10));
+  test_task_runner_->RunUntilIdle();
+  EXPECT_EQ(3, run_count);
+}
+
+TEST_F(MultiThreadedIdleHelperTest, DelayedIdleTasksFromNonMainThreads) {
+  int run_count = 0;
+
+  test_task_runner_->AdvanceMockTickClock(base::Milliseconds(100));
+
+  PostDelayedIdleTaskFromNewThread(base::Milliseconds(200), &run_count);
+  PostDelayedIdleTaskFromNewThread(base::Milliseconds(250), &run_count);
+  PostDelayedIdleTaskFromNewThread(base::Milliseconds(300), &run_count);
+
+  // Delayed idle tasks are not queued until a new idle period starts.
+  EXPECT_EQ(0u, idle_queue()->GetNumberOfPendingTasks());
+  test_task_runner_->RunUntilIdle();
+  EXPECT_EQ(0, run_count);
+
+  test_task_runner_->AdvanceMockTickClock(base::Milliseconds(300));
+  idle_helper_->StartIdlePeriod(
+      IdleHelper::IdlePeriodState::kInShortIdlePeriod,
+      test_task_runner_->NowTicks(),
+      test_task_runner_->NowTicks() + base::Milliseconds(10));
+  EXPECT_EQ(3u, idle_queue()->GetNumberOfPendingTasks());
+  test_task_runner_->RunUntilIdle();
+
+  EXPECT_EQ(3, run_count);
+}
+
+TEST_F(MultiThreadedIdleHelperTest,
+       DelayedAndNonDelayedIdleTasksFromMultipleThreads) {
+  int run_count = 0;
+
+  PostIdleTaskFromNewThread(&run_count);
+
+  idle_task_runner_->PostIdleTask(
+      FROM_HERE, base::BindOnce(&IdleTestTask, &run_count, nullptr));
+
+  PostDelayedIdleTaskFromNewThread(base::Milliseconds(200), &run_count);
+
+  idle_task_runner_->PostDelayedIdleTask(
+      FROM_HERE, base::Milliseconds(250),
+      base::BindOnce(&IdleTestTask, &run_count, nullptr));
+
+  test_task_runner_->AdvanceMockTickClock(base::Milliseconds(250));
+
+  EXPECT_EQ(2u, idle_queue()->GetNumberOfPendingTasks());
+  test_task_runner_->RunUntilIdle();
+  EXPECT_EQ(0, run_count);
+
+  idle_helper_->StartIdlePeriod(
+      IdleHelper::IdlePeriodState::kInShortIdlePeriod,
+      test_task_runner_->NowTicks(),
+      test_task_runner_->NowTicks() + base::Milliseconds(10));
+  EXPECT_EQ(4u, idle_queue()->GetNumberOfPendingTasks());
+  test_task_runner_->RunUntilIdle();
+
+  EXPECT_EQ(4, run_count);
+}
+
 }  // namespace idle_helper_unittest
 }  // namespace scheduler
 }  // namespace blink

third_party/blink/renderer/platform/scheduler/common/single_thread_idle_task_runner.cc

diff --git a/third_party/blink/renderer/platform/scheduler/common/single_thread_idle_task_runner.cc b/third_party/blink/renderer/platform/scheduler/common/single_thread_idle_task_runner.cc
index 8722f52..fccb9ad 100644
--- a/third_party/blink/renderer/platform/scheduler/common/single_thread_idle_task_runner.cc
+++ b/third_party/blink/renderer/platform/scheduler/common/single_thread_idle_task_runner.cc
@@ -14,8 +14,10 @@
 
 SingleThreadIdleTaskRunner::SingleThreadIdleTaskRunner(
     scoped_refptr<base::SingleThreadTaskRunner> idle_priority_task_runner,
+    scoped_refptr<base::SingleThreadTaskRunner> control_task_runner,
     Delegate* delegate)
-    : idle_priority_task_runner_(idle_priority_task_runner),
+    : idle_priority_task_runner_(std::move(idle_priority_task_runner)),
+      control_task_runner_(std::move(control_task_runner)),
       delegate_(delegate),
       blame_context_(nullptr) {
   weak_scheduler_ptr_ = weak_factory_.GetWeakPtr();
@@ -38,14 +40,31 @@
       from_here, base::BindOnce(&SingleThreadIdleTaskRunner::RunTask,
                                 weak_scheduler_ptr_, std::move(idle_task)));
 }
-
 void SingleThreadIdleTaskRunner::PostDelayedIdleTask(
     const base::Location& from_here,
     const base::TimeDelta delay,
     IdleTask idle_task) {
-  base::TimeTicks first_run_time = delegate_->NowTicks() + delay;
+  base::TimeTicks delayed_run_time = delegate_->NowTicks() + delay;
+  if (RunsTasksInCurrentSequence()) {
+    PostDelayedIdleTaskOnAssociatedThread(from_here, delayed_run_time,
+                                          std::move(idle_task));
+  } else {
+    control_task_runner_->PostTask(
+        FROM_HERE,
+        base::BindOnce(
+            &SingleThreadIdleTaskRunner::PostDelayedIdleTaskOnAssociatedThread,
+            weak_scheduler_ptr_, from_here, delayed_run_time,
+            std::move(idle_task)));
+  }
+}
+
+void SingleThreadIdleTaskRunner::PostDelayedIdleTaskOnAssociatedThread(
+    const base::Location& from_here,
+    const base::TimeTicks delayed_run_time,
+    IdleTask idle_task) {
+  DCHECK(RunsTasksInCurrentSequence());
   delayed_idle_tasks_.emplace(
-      first_run_time,
+      delayed_run_time,
       std::make_pair(
           from_here,
           base::BindOnce(&SingleThreadIdleTaskRunner::RunTask,

third_party/blink/renderer/platform/scheduler/common/single_thread_idle_task_runner.h

diff --git a/third_party/blink/renderer/platform/scheduler/common/single_thread_idle_task_runner.h b/third_party/blink/renderer/platform/scheduler/common/single_thread_idle_task_runner.h
index a2271e8..dade662 100644
--- a/third_party/blink/renderer/platform/scheduler/common/single_thread_idle_task_runner.h
+++ b/third_party/blink/renderer/platform/scheduler/common/single_thread_idle_task_runner.h
@@ -70,6 +70,7 @@
   // literals). They may not include " chars.
   SingleThreadIdleTaskRunner(
       scoped_refptr<base::SingleThreadTaskRunner> idle_priority_task_runner,
+      scoped_refptr<base::SingleThreadTaskRunner> control_task_runner,
       Delegate* delegate);
   SingleThreadIdleTaskRunner(const SingleThreadIdleTaskRunner&) = delete;
   SingleThreadIdleTaskRunner& operator=(const SingleThreadIdleTaskRunner&) =
@@ -103,9 +104,15 @@
 
   void EnqueueReadyDelayedIdleTasks();
 
+  void PostDelayedIdleTaskOnAssociatedThread(
+      const base::Location& from_here,
+      const base::TimeTicks delayed_run_time,
+      IdleTask idle_task);
+
   using DelayedIdleTask = std::pair<const base::Location, base::OnceClosure>;
 
   scoped_refptr<base::SingleThreadTaskRunner> idle_priority_task_runner_;
+  scoped_refptr<base::SingleThreadTaskRunner> control_task_runner_;
   std::multimap<base::TimeTicks, DelayedIdleTask> delayed_idle_tasks_;
   Delegate* delegate_;                              // NOT OWNED
   base::trace_event::BlameContext* blame_context_;  // Not owned.

third_party/blink/renderer/platform/scheduler/worker/compositor_thread_scheduler.cc

diff --git a/third_party/blink/renderer/platform/scheduler/worker/compositor_thread_scheduler.cc b/third_party/blink/renderer/platform/scheduler/worker/compositor_thread_scheduler.cc
index 42fa7de9..2f011b3b2 100644
--- a/third_party/blink/renderer/platform/scheduler/worker/compositor_thread_scheduler.cc
+++ b/third_party/blink/renderer/platform/scheduler/worker/compositor_thread_scheduler.cc
@@ -65,7 +65,7 @@
   // which runs them after the current frame has been drawn before the next
   // vsync. https://crbug.com/609532
   return base::MakeRefCounted<SingleThreadIdleTaskRunner>(
-      helper()->DefaultTaskRunner(), this);
+      helper()->DefaultTaskRunner(), helper()->ControlTaskRunner(), this);
 }
 
 scoped_refptr<base::SingleThreadTaskRunner>

third_party/blink/web_tests/FlagExpectations/disable-layout-ng

diff --git a/third_party/blink/web_tests/FlagExpectations/disable-layout-ng b/third_party/blink/web_tests/FlagExpectations/disable-layout-ng
index eec508b..9b50f018 100644
--- a/third_party/blink/web_tests/FlagExpectations/disable-layout-ng
+++ b/third_party/blink/web_tests/FlagExpectations/disable-layout-ng
@@ -1080,6 +1080,7 @@
 crbug.com/1035582 virtual/prefer_compositing_to_lcd_text/scrollbars/listbox-scrollbar-combinations.html [ Failure ]
 crbug.com/1035582 virtual/scalefactor150/fast/hidpi/static/calendar-picker-appearance.html [ Failure ]
 crbug.com/1035582 http/tests/devtools/sources/debugger-breakpoints/disable-breakpoints.js [ Failure Timeout ]
+crbug.com/1035582 virtual/shared_array_buffer_on_desktop/http/tests/devtools/sources/debugger-breakpoints/disable-breakpoints.js [ Failure Timeout ]
 crbug.com/1035582 paint/invalidation/forms/checkbox-focus-by-mouse-then-keydown.html [ Failure ]
 crbug.com/1035582 paint/invalidation/forms/radio-focus-by-mouse-then-keydown.html [ Failure ]
 crbug.com/1035582 editing/input/linux_rtl_composition_underline.html [ Failure ]

third_party/blink/web_tests/FlagExpectations/highdpi

diff --git a/third_party/blink/web_tests/FlagExpectations/highdpi b/third_party/blink/web_tests/FlagExpectations/highdpi
index 0c63020..f96ef02 100644
--- a/third_party/blink/web_tests/FlagExpectations/highdpi
+++ b/third_party/blink/web_tests/FlagExpectations/highdpi
@@ -124,6 +124,7 @@
 crbug.com/1179544 compositing/gestures/gesture-tapHighlight-1-overflow-div-composited-scrolled.html [ Failure ]
 crbug.com/1179544 compositing/gestures/gesture-tapHighlight-1-overflow-div-composited.html [ Failure ]
 crbug.com/1179544 compositing/gestures/gesture-tapHighlight-1-overflow-div-scrolled-late-noncomposite.html [ Failure ]
+crbug.com/1179544 compositing/gestures/gesture-tapHighlight-lines-and-float-in-multicol-2.html [ Failure ]
 crbug.com/1179544 compositing/gestures/gesture-tapHighlight-on-promoted-overflow-div-scrolled.html [ Failure ]
 crbug.com/1179544 compositing/gestures/gesture-tapHighlight-simple-margin.html [ Failure ]
 crbug.com/1179544 compositing/gestures/gesture-tapHighlight-simple-multi-line.html [ Failure ]
@@ -266,6 +267,7 @@
 crbug.com/1179556 paint/invalidation/compositing/subpixel-offset-scaled-will-change-transform.html [ Failure ]
 crbug.com/1179556 paint/invalidation/position/fixed-scale.html [ Failure ]
 crbug.com/1179556 paint/invalidation/position/relayout-fixed-position-after-scale.html [ Failure ]
+crbug.com/1179556 paint/invalidation/compositing/repaint-squashed-layer-in-rect.html [ Failure ]
 crbug.com/1179556 paint/invalidation/svg/image-animation-with-zoom.html [ Failure ]
 crbug.com/1179556 paint/invalidation/svg/non-scaling-stroke-change-container-transform.html [ Failure ]
 crbug.com/1179556 paint/invalidation/table/collapsed-border-cell-change-width-composited-row.html [ Failure ]
@@ -349,6 +351,7 @@
 
 crbug.com/1179572 transforms/combine-transforms-properties-transform.html [ Failure ]
 crbug.com/1179572 transforms/perspective-fixed-pos-descendant.html [ Failure ]
+crbug.com/1179572 transforms/transformed-document-element.html [ Failure ]
 
 crbug.com/1179570 virtual/forced-high-contrast-colors/external/wpt/forced-colors-mode/backplate/forced-colors-mode-backplate-10.html [ Failure ]
 crbug.com/1179570 virtual/forced-high-contrast-colors/fast/css/forced-colors-mode/forced-colors-mode-04.html [ Failure ]
@@ -380,6 +383,7 @@
 
 # These appear to be flaky
 crbug.com/1191215 fast/backgrounds/root-background-fixed-attachment-positioning.html [ Failure Pass ]
+crbug.com/1191215 fast/forms/date/date-appearance-basic.html [ Failure Pass ]
 crbug.com/1191215 fast/forms/number/number-appearance-datalist.html [ Failure Pass ]
 crbug.com/1191215 fast/forms/text/text-appearance-datalist.html [ Failure Pass ]
 crbug.com/1191215 fast/events/wheel/wheelevent-in-scrolling-div.html [ Failure Timeout ]
@@ -503,6 +507,7 @@
 crbug.com/1266821 virtual/backface-visibility-interop/compositing/overflow/rotate-clip.html [ Failure ]
 crbug.com/1266821 virtual/backface-visibility-interop/compositing/overflow/rotate-then-clip.html [ Failure ]
 crbug.com/1266821 virtual/backface-visibility-interop/compositing/overflow/tiled-mask.html [ Failure ]
+crbug.com/1266821 virtual/backface-visibility-interop/paint/invalidation/compositing/repaint-squashed-layer-in-rect.html [ Failure ]
 crbug.com/1266821 virtual/backface-visibility-interop/paint/invalidation/scroll/scrollbar-damage-and-full-viewport-repaint.html [ Failure ]
 crbug.com/1266821 virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-section-composited-row-initial-empty.html [ Failure ]
 crbug.com/1266821 virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-section-composited-row.html [ Failure ]

third_party/blink/web_tests/SlowTests

diff --git a/third_party/blink/web_tests/SlowTests b/third_party/blink/web_tests/SlowTests
index 1a68ff32..d64c6a01 100644
--- a/third_party/blink/web_tests/SlowTests
+++ b/third_party/blink/web_tests/SlowTests
@@ -270,6 +270,7 @@
 crbug.com/866850 [ Linux ] virtual/gpu/fast/canvas/color-space/canvas-createImageBitmap-rec2020.html [ Slow ]
 crbug.com/866850 [ Mac ] virtual/gpu/fast/canvas/color-space/canvas-createImageBitmap-rec2020.html [ Slow ]
 crbug.com/866850 [ Linux ] virtual/gpu/fast/canvas/OffscreenCanvas-filter.html [ Slow ]
+crbug.com/866850 [ Mac11 ] virtual/gpu/fast/canvas/getPutImageDataPairTest.html [ Slow ]
 crbug.com/866850 [ Mac ] virtual/gpu/fast/canvas/OffscreenCanvas-filter.html [ Slow ]
 crbug.com/866850 [ Linux ] virtual/gpu/fast/canvas/OffscreenCanvas-filter-in-worker.html [ Slow ]
 crbug.com/866850 [ Mac ] virtual/gpu/fast/canvas/OffscreenCanvas-filter-in-worker.html [ Slow ]

third_party/blink/web_tests/SmokeTests

diff --git a/third_party/blink/web_tests/SmokeTests b/third_party/blink/web_tests/SmokeTests
index 46e526c..89bde3c 100644
--- a/third_party/blink/web_tests/SmokeTests
+++ b/third_party/blink/web_tests/SmokeTests
@@ -121,7 +121,7 @@
 editing/style/stylewithcss-without-selection.html
 editing/undo/5738768.html
 editing/undo/orphaned-selection-crash-bug32823-3.html
-external/wpt/bluetooth/idl/idl-NavigatorBluetooth.html
+external/wpt/bluetooth/idl/idl-NavigatorBluetooth.window.html
 external/wpt/bluetooth/requestDevice/canonicalizeFilter/no-arguments.https.html
 external/wpt/content-security-policy/connect-src/connect-src-beacon-blocked.sub.html
 external/wpt/content-security-policy/font-src/font-match-allowed.sub.html

third_party/blink/web_tests/TestExpectations

diff --git a/third_party/blink/web_tests/TestExpectations b/third_party/blink/web_tests/TestExpectations
index f519a79..a704d55 100644
--- a/third_party/blink/web_tests/TestExpectations
+++ b/third_party/blink/web_tests/TestExpectations
@@ -127,6 +127,7 @@
 # Fails flakily or times out
 crbug.com/1255285 virtual/threaded/transitions/transition-currentcolor.html [ Failure Pass ]
 crbug.com/1255285 virtual/threaded/transitions/transition-ends-before-animation-frame.html [ Timeout ]
+crbug.com/1269536 svg/animations/dynamic-modify-transform-without-baseval.html [ Failure Pass ]
 
 # Unknown media state flakiness (likely due to layout occuring earlier than expected):
 crbug.com/1254945 external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-insert-before.html [ Failure Pass ]
@@ -295,7 +296,7 @@
 crbug.com/624233 virtual/gpu-rasterization/images/color-profile-background-clip-text.html [ Failure Pass ]
 crbug.com/757605 virtual/gpu-rasterization/images/jpeg-yuv-progressive-image.html [ Failure Pass ]
 crbug.com/1223284 [ Win7 ] virtual/gpu-rasterization/images/color-profile-background-image-cross-fade.html [ Failure Pass ]
-crbug.com/1223284 [ Mac11-arm64 ] virtual/gpu-rasterization/images/color-profile-background-image-cross-fade.html [ Failure Pass ]
+crbug.com/1223284 [ Mac ] virtual/gpu-rasterization/images/color-profile-background-image-cross-fade.html [ Failure Pass ]
 
 ########## Bugs to fix ##########
 # This is a missing event and increasing the timeout or using run-after-layout-and-paint doesn't
@@ -1261,6 +1262,11 @@
 virtual/layout_ng_flex_frag/external/wpt/css/css-break/flexbox/flex-container-fragmentation-003.html [ Pass ]
 virtual/layout_ng_flex_frag/external/wpt/css/css-break/flexbox/flex-container-fragmentation-004.html [ Pass ]
 virtual/layout_ng_flex_frag/external/wpt/css/css-break/flexbox/flex-container-fragmentation-007.tentative.html [ Pass ]
+virtual/layout_ng_flex_frag/external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-010.html [ Pass ]
+virtual/layout_ng_flex_frag/external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-012.html [ Pass ]
+virtual/layout_ng_flex_frag/external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-014.html [ Pass ]
+virtual/layout_ng_flex_frag/external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-015.html [ Pass ]
+virtual/layout_ng_flex_frag/external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-016.html [ Pass ]
 virtual/layout_ng_flex_frag/external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-012.html [ Pass ]
 virtual/layout_ng_flex_frag/external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-014.html [ Pass ]
 virtual/layout_ng_flex_frag/external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-015.html [ Pass ]
@@ -1271,10 +1277,11 @@
 virtual/layout_ng_flex_frag/external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-020.html [ Pass ]
 virtual/layout_ng_flex_frag/external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-022.html [ Pass ]
 virtual/layout_ng_flex_frag/external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-023.html [ Pass ]
+virtual/layout_ng_flex_frag/external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-030.html [ Pass ]
+virtual/layout_ng_flex_frag/external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-031.html [ Pass ]
 
 ### Tests failing with LayoutNGFlexFragmentation enabled:
 crbug.com/660611 virtual/layout_ng_flex_frag/fast/multicol/flexbox/doubly-nested-with-zero-width-flexbox-and-forced-break-crash.html [ Skip ]
-crbug.com/660611 virtual/layout_ng_flex_frag/fast/multicol/flexbox/flexbox.html [ Failure ]
 
 ### Tests passing with LayoutNGGridFragmentation enabled:
 virtual/layout_ng_grid_frag/external/wpt/css/css-break/grid/grid-item-fragmentation-020.html [ Pass ]
@@ -2765,6 +2772,16 @@
 crbug.com/626703 fast/animation/scroll-animations/scrolltimeline-root-scroller-quirks-mode.html [ Failure ]
 crbug.com/626703 virtual/plz-dedicated-worker/external/wpt/service-workers/service-worker/navigation-timing-extended.https.html [ Failure ]
 crbug.com/626703 external/wpt/preload/preload-resource-match.https.html [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/html/syntax/charset/without-inheritance.html [ Failure ]
+crbug.com/626703 external/wpt/html/syntax/speculative-charset/speculative-script.tentative.html [ Failure ]
+crbug.com/626703 [ Mac ] external/wpt/css/css-masking/clip-path/clip-path-strokeBox-1b.html [ Failure ]
+crbug.com/626703 [ Mac ] external/wpt/css/css-masking/clip-path/clip-path-viewBox-1c.html [ Failure ]
+crbug.com/626703 [ Mac ] external/wpt/css/css-pseudo/first-letter-hi-001.html [ Failure ]
+crbug.com/626703 [ Mac ] external/wpt/css/css-ruby/nested-ruby-pairing-001.html [ Failure ]
+crbug.com/626703 [ Mac ] external/wpt/css/css-ruby/ruby-autohide-002.html [ Failure ]
+crbug.com/626703 [ Mac ] external/wpt/css/css-ruby/ruby-autohide-004.html [ Failure ]
+crbug.com/626703 [ Mac ] external/wpt/css/css-text/line-breaking/segment-break-transformation-rules-009.html [ Failure ]
+crbug.com/626703 [ Mac ] external/wpt/css/css-text/line-breaking/segment-break-transformation-rules-015.html [ Failure ]
 
 # ====== New tests from wpt-importer added here ======
 crbug.com/626703 external/wpt/infrastructure/channels/test_call.html [ Timeout ]
@@ -2772,7 +2789,7 @@
 crbug.com/626703 external/wpt/infrastructure/channels/test_serialize.html [ Timeout ]
 crbug.com/626703 [ Win10.20h2 ] external/wpt/mediacapture-streams/MediaDevices-enumerateDevices-per-origin-ids.sub.https.html [ Failure Timeout ]
 crbug.com/626703 [ Win10.20h2 ] virtual/feature-policy-permissions/external/wpt/mediacapture-streams/MediaDevices-enumerateDevices-per-origin-ids.sub.https.html [ Failure Timeout ]
-crbug.com/626703 [ Mac10.15 ] wpt_internal/webcodecs/basic_video_encoding.https.any.worker.html [ Crash Timeout ]
+crbug.com/626703 [ Mac ] wpt_internal/webcodecs/basic_video_encoding.https.any.worker.html [ Crash Timeout ]
 crbug.com/626703 [ Mac10.14 ] virtual/threaded/external/wpt/scroll-animations/css/at-scroll-timeline-default-descriptors-iframe.html [ Failure ]
 crbug.com/626703 [ Mac10.15 ] virtual/threaded/external/wpt/scroll-animations/css/at-scroll-timeline-default-descriptors-iframe.html [ Failure ]
 crbug.com/626703 [ Mac11 ] virtual/threaded/external/wpt/scroll-animations/css/at-scroll-timeline-default-descriptors-iframe.html [ Failure ]
@@ -2869,6 +2886,7 @@
 crbug.com/626703 [ Mac10.15 ] virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/characteristic/notifications/service-is-removed.https.window.html [ Timeout ]
 crbug.com/626703 [ Mac10.15 ] virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/characteristic/writeValue/write-succeeds.https.window.html [ Timeout ]
 crbug.com/626703 [ Mac10.15 ] virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/requestDevice/canonicalizeFilter/empty-services-member.https.html [ Timeout ]
+crbug.com/626703 [ Mac11 ] virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/requestDevice/canonicalizeFilter/max-length-name-unicode.https.html [ Crash ]
 crbug.com/626703 [ Mac10.15 ] virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/service/getCharacteristics/characteristics-found-with-uuid.https.html [ Timeout ]
 crbug.com/626703 [ Mac10.15 ] virtual/web-bluetooth-new-permissions-backend/external/wpt/bluetooth/service/getCharacteristics/gen-reconnect-during-with-uuid.https.window.html [ Timeout ]
 crbug.com/626703 [ Mac10.15 ] virtual/web-bluetooth-new-permissions-backend/wpt_internal/bluetooth/characteristic/getDescriptors/gen-descriptor-disconnect-called-during-error-with-uuid.https.html [ Timeout ]
@@ -2913,6 +2931,7 @@
 crbug.com/626703 [ Mac11-arm64 ] virtual/backface-visibility-interop/external/wpt/css/css-transforms/matrix/svg-matrix-045.html [ Crash ]
 crbug.com/626703 [ Mac11-arm64 ] virtual/backface-visibility-interop/external/wpt/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-005.html [ Crash ]
 crbug.com/626703 [ Mac11-arm64 ] virtual/backface-visibility-interop/external/wpt/css/css-transforms/transform-origin/svg-origin-length-001.html [ Crash ]
+crbug.com/626703 [ Mac11 ] virtual/backface-visibility-interop/external/wpt/css/css-transforms/transform-origin/svg-origin-length-pt-001.html [ Crash ]
 crbug.com/626703 [ Mac11-arm64 ] virtual/backface-visibility-interop/external/wpt/css/css-transforms/transform-scale-test.html [ Crash ]
 crbug.com/626703 [ Mac11-arm64 ] virtual/backface-visibility-interop/external/wpt/css/css-transforms/scale/svg-scale-001.html [ Crash ]
 crbug.com/626703 [ Mac11-arm64 ] virtual/backface-visibility-interop/external/wpt/css/css-transforms/inline-styles/svg-inline-styles-005.html [ Crash ]
@@ -3062,6 +3081,7 @@
 crbug.com/626703 [ Mac11 ] virtual/no-auto-wpt-origin-isolation/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html [ Failure Timeout ]
 crbug.com/626703 [ Mac11 ] virtual/no-auto-wpt-origin-isolation/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-same.sub.https.html [ Failure Timeout ]
 crbug.com/626703 [ Mac11 ] virtual/no-auto-wpt-origin-isolation/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html [ Failure Timeout ]
+crbug.com/626703 [ Mac ] virtual/no-auto-wpt-origin-isolation/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-port.sub.https.html [ Failure Timeout ]
 crbug.com/626703 [ Win ] external/wpt/websockets/Create-blocked-port.any.worker.html?wpt_flags=h2 [ Failure Timeout ]
 crbug.com/626703 [ Mac11 ] external/wpt/webauthn/createcredential-getpublickey.https.html [ Crash Skip Timeout ]
 crbug.com/626703 [ Mac11 ] external/wpt/webauthn/credblob-not-supported.https.html [ Crash Skip Timeout ]
@@ -3749,6 +3769,11 @@
 crbug.com/660611 external/wpt/css/css-break/flexbox/flex-container-fragmentation-003.html [ Failure ]
 crbug.com/660611 external/wpt/css/css-break/flexbox/flex-container-fragmentation-004.html [ Failure ]
 crbug.com/660611 external/wpt/css/css-break/flexbox/flex-container-fragmentation-007.tentative.html [ Failure ]
+crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-010.html [ Failure ]
+crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-012.html [ Failure ]
+crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-014.html [ Failure ]
+crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-015.html [ Failure ]
+crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-016.html [ Failure ]
 crbug.com/660611 external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-012.html [ Failure ]
 crbug.com/660611 external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-014.html [ Failure ]
 crbug.com/660611 external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-015.html [ Failure ]
@@ -3759,6 +3784,8 @@
 crbug.com/660611 external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-020.html [ Failure ]
 crbug.com/660611 external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-022.html [ Failure ]
 crbug.com/660611 external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-023.html [ Failure ]
+crbug.com/660611 external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-030.html [ Failure ]
+crbug.com/660611 external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-031.html [ Failure ]
 crbug.com/614667 external/wpt/css/css-break/grid/grid-item-fragmentation-020.html [ Failure ]
 crbug.com/614667 external/wpt/css/css-break/grid/grid-item-fragmentation-027.tentative.html [ Failure ]
 crbug.com/614667 external/wpt/css/css-break/grid/grid-item-fragmentation-028.html [ Failure ]
@@ -5271,6 +5298,7 @@
 
 # Sheriff 2020-03-06
 crbug.com/1059262 http/tests/worklet/webexposed/global-interface-listing-paint-worklet.html [ Failure Pass ]
+crbug.com/1059262 [ Mac ] webexposed/global-interface-listing-platform-specific.html [ Failure Pass ]
 crbug.com/1058244 [ Mac ] virtual/threaded-prefer-compositing/fast/scrolling/scrollbars/scrollbar-rtl-manipulation.html [ Failure Pass ]
 
 # Sheriff 2020-03-08
@@ -6256,7 +6284,7 @@
 
 # Sheriff 2021-06-29
 # Flaky on Mac11 Tests
-crbug.com/1197464 [ Mac ] virtual/scroll-unification/plugins/refcount-leaks.html [ Failure Pass ]
+crbug.com/1197464 [ Mac ] plugins/refcount-leaks.html [ Failure Pass ]
 
 # Sheriff 2021-06-30
 crbug.com/1216587 [ Win7 ] accessibility/scroll-window-sends-notification.html [ Failure Pass ]
@@ -6593,7 +6621,6 @@
 crbug.com/1249176 [ Mac11-arm64 ] wpt_internal/webcodecs/avc_encoder_config.https.any.html [ Failure Pass ]
 crbug.com/1249176 [ Mac11-arm64 ] wpt_internal/webcodecs/avc_encoder_config.https.any.worker.html [ Failure Pass ]
 crbug.com/1249176 [ Mac11-arm64 ] wpt_internal/webcodecs/basic_video_encoding.https.any.html [ Failure Pass ]
-crbug.com/1249176 [ Mac11-arm64 ] wpt_internal/webcodecs/basic_video_encoding.https.any.worker.html [ Failure Pass ]
 crbug.com/1249176 [ Mac11-arm64 ] wpt_internal/webcodecs/temporal_svc.https.any.html [ Failure Pass ]
 crbug.com/1249176 [ Mac11-arm64 ] wpt_internal/webcodecs/temporal_svc.https.any.worker.html [ Failure Pass ]
 crbug.com/1249176 [ Mac11-arm64 ] external/wpt/webcodecs/audioDecoder-codec-specific.https.any.worker.html?adts_aac [ Pass Timeout ]
@@ -6834,7 +6861,7 @@
 crbug.com/1268518 [ Linux ] external/wpt/web-animations/interfaces/Animation/onfinish.html [ Failure Pass ]
 crbug.com/1268518 [ Mac10.12 ] external/wpt/web-animations/interfaces/Animation/onfinish.html [ Failure Pass ]
 crbug.com/1269535 http/tests/misc/resource-timing-sizes-multipart.html [ Failure Pass Timeout ]
-crbug.com/1267734 [ Win7 ] virtual/scroll-unification/fast/forms/suggestion-picker/week-suggestion-picker-appearance.html [ Failure Pass ]
+crbug.com/1267734 [ Win7 ] fast/forms/suggestion-picker/week-suggestion-picker-appearance.html [ Failure Pass ]
 
 # This test is flaky on all platforms
 crbug.com/1191846 virtual/prerender/external/wpt/speculation-rules/prerender/local-storage.html [ Failure Pass ]
@@ -6871,8 +6898,8 @@
 crbug.com/1272380 http/tests/devtools/bindings/bindings-multiple-frames.js [ Failure Pass ]
 crbug.com/1272575 [ Mac ] virtual/gpu-rasterization/images/color-profile-svg-fill-text.html [ Failure Pass ]
 
-# Flaky on mac 10.13
-crbug.com/1263709 [ Mac10.13 ] http/tests/devtools/elements/node-xpath.js [ Failure ]
+# Flaky on mac
+crbug.com/1263709 [ Mac ] http/tests/devtools/elements/node-xpath.js [ Failure ]
 
 # Flaky on Mac and Windows
 crbug.com/1272199 external/wpt/websockets/stream/tentative/backpressure-receive.any.serviceworker.html?wpt_flags=h2 [ Failure Pass ]

third_party/blink/web_tests/android/ChromeWPTOverrideExpectations

diff --git a/third_party/blink/web_tests/android/ChromeWPTOverrideExpectations b/third_party/blink/web_tests/android/ChromeWPTOverrideExpectations
index 704d0cab..65507c7e 100644
--- a/third_party/blink/web_tests/android/ChromeWPTOverrideExpectations
+++ b/third_party/blink/web_tests/android/ChromeWPTOverrideExpectations
@@ -391,11 +391,11 @@
 crbug.com/1050754 external/wpt/bluetooth/getDevices/granted-devices-with-services.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/getDevices/no-granted-devices.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/getDevices/returns-same-bluetooth-device-object.https.window.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/idl/idl-BluetoothDevice.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/requestDevice/acceptAllDevices/device-with-empty-name.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/requestDevice/acceptAllDevices/device-with-name.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/requestDevice/acceptAllDevices/optional-services-missing.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/requestDevice/acceptAllDevices/optional-services-present.https.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/idl/idl-BluetoothDevice.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/requestDevice/acceptAllDevices/device-with-empty-name.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/requestDevice/acceptAllDevices/device-with-name.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/requestDevice/acceptAllDevices/optional-services-missing.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/requestDevice/acceptAllDevices/optional-services-present.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/requestDevice/blocklisted-service-in-filter.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/requestDevice/blocklisted-service-in-optionalServices.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/requestDevice/canonicalizeFilter/device-name-longer-than-29-bytes.https.html [ Failure ]

third_party/blink/web_tests/android/WebLayerWPTOverrideExpectations

diff --git a/third_party/blink/web_tests/android/WebLayerWPTOverrideExpectations b/third_party/blink/web_tests/android/WebLayerWPTOverrideExpectations
index ab2fbe9..91148f0e 100644
--- a/third_party/blink/web_tests/android/WebLayerWPTOverrideExpectations
+++ b/third_party/blink/web_tests/android/WebLayerWPTOverrideExpectations
@@ -452,11 +452,11 @@
 crbug.com/1050754 external/wpt/bluetooth/getDevices/granted-devices-with-services.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/getDevices/no-granted-devices.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/getDevices/returns-same-bluetooth-device-object.https.window.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/idl/idl-BluetoothDevice.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/requestDevice/acceptAllDevices/device-with-empty-name.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/requestDevice/acceptAllDevices/device-with-name.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/requestDevice/acceptAllDevices/optional-services-missing.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/requestDevice/acceptAllDevices/optional-services-present.https.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/idl/idl-BluetoothDevice.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/requestDevice/acceptAllDevices/device-with-empty-name.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/requestDevice/acceptAllDevices/device-with-name.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/requestDevice/acceptAllDevices/optional-services-missing.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/requestDevice/acceptAllDevices/optional-services-present.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/requestDevice/blocklisted-service-in-filter.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/requestDevice/blocklisted-service-in-optionalServices.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/requestDevice/canonicalizeFilter/data-prefix-and-mask-size.https.window.html [ Failure ]

third_party/blink/web_tests/android/WebviewWPTExpectations

diff --git a/third_party/blink/web_tests/android/WebviewWPTExpectations b/third_party/blink/web_tests/android/WebviewWPTExpectations
index 01f83ad..718eb6b4 100644
--- a/third_party/blink/web_tests/android/WebviewWPTExpectations
+++ b/third_party/blink/web_tests/android/WebviewWPTExpectations
@@ -348,13 +348,13 @@
 crbug.com/1050754 external/wpt/bluetooth/getDevices/granted-devices-with-services.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/getDevices/no-granted-devices.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/getDevices/returns-same-bluetooth-device-object.https.window.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/idl/idl-Bluetooth.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/idl/idl-BluetoothDevice.https.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/idl/idl-Bluetooth.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/idl/idl-BluetoothDevice.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/idl/idlharness.tentative.https.window.html [ Failure Pass ]
-crbug.com/1050754 external/wpt/bluetooth/requestDevice/acceptAllDevices/device-with-empty-name.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/requestDevice/acceptAllDevices/device-with-name.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/requestDevice/acceptAllDevices/optional-services-missing.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/requestDevice/acceptAllDevices/optional-services-present.https.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/requestDevice/acceptAllDevices/device-with-empty-name.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/requestDevice/acceptAllDevices/device-with-name.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/requestDevice/acceptAllDevices/optional-services-missing.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/requestDevice/acceptAllDevices/optional-services-present.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/requestDevice/blocklisted-service-in-filter.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/requestDevice/blocklisted-service-in-optionalServices.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/requestDevice/canonicalizeFilter/device-name-longer-than-29-bytes.https.html [ Failure ]

third_party/blink/web_tests/compositing/3d-corners-expected.png

diff --git a/third_party/blink/web_tests/platform/win/compositing/3d-corners-expected.png b/third_party/blink/web_tests/compositing/3d-corners-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/compositing/3d-corners-expected.png
rename to third_party/blink/web_tests/compositing/3d-corners-expected.png
Binary files differ

third_party/blink/web_tests/compositing/3d-cube-expected.png

diff --git a/third_party/blink/web_tests/platform/win/compositing/3d-cube-expected.png b/third_party/blink/web_tests/compositing/3d-cube-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/compositing/3d-cube-expected.png
rename to third_party/blink/web_tests/compositing/3d-cube-expected.png
Binary files differ

third_party/blink/web_tests/compositing/flat-with-transformed-child-expected.png

diff --git a/third_party/blink/web_tests/compositing/flat-with-transformed-child-expected.png b/third_party/blink/web_tests/compositing/flat-with-transformed-child-expected.png
index fef1beb..c319372 100644
--- a/third_party/blink/web_tests/compositing/flat-with-transformed-child-expected.png
+++ b/third_party/blink/web_tests/compositing/flat-with-transformed-child-expected.png
Binary files differ

third_party/blink/web_tests/compositing/geometry/vertical-scroll-composited-expected.png

diff --git a/third_party/blink/web_tests/platform/win/compositing/geometry/vertical-scroll-composited-expected.png b/third_party/blink/web_tests/compositing/geometry/vertical-scroll-composited-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/compositing/geometry/vertical-scroll-composited-expected.png
rename to third_party/blink/web_tests/compositing/geometry/vertical-scroll-composited-expected.png
Binary files differ

third_party/blink/web_tests/compositing/lots-of-img-layers-expected.png

diff --git a/third_party/blink/web_tests/platform/win/compositing/lots-of-img-layers-expected.png b/third_party/blink/web_tests/compositing/lots-of-img-layers-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/compositing/lots-of-img-layers-expected.png
rename to third_party/blink/web_tests/compositing/lots-of-img-layers-expected.png
Binary files differ

third_party/blink/web_tests/compositing/lots-of-img-layers-with-opacity-expected.png

diff --git a/third_party/blink/web_tests/platform/win/compositing/lots-of-img-layers-with-opacity-expected.png b/third_party/blink/web_tests/compositing/lots-of-img-layers-with-opacity-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/compositing/lots-of-img-layers-with-opacity-expected.png
rename to third_party/blink/web_tests/compositing/lots-of-img-layers-with-opacity-expected.png
Binary files differ

third_party/blink/web_tests/compositing/overflow/border-radius-styles-with-composited-child-expected.png

diff --git a/third_party/blink/web_tests/compositing/overflow/border-radius-styles-with-composited-child-expected.png b/third_party/blink/web_tests/compositing/overflow/border-radius-styles-with-composited-child-expected.png
index e655e3a..842cefa4 100644
--- a/third_party/blink/web_tests/compositing/overflow/border-radius-styles-with-composited-child-expected.png
+++ b/third_party/blink/web_tests/compositing/overflow/border-radius-styles-with-composited-child-expected.png
Binary files differ

third_party/blink/web_tests/compositing/overflow/mask-with-filter-expected.png

diff --git a/third_party/blink/web_tests/platform/win/compositing/overflow/mask-with-filter-expected.png b/third_party/blink/web_tests/compositing/overflow/mask-with-filter-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/compositing/overflow/mask-with-filter-expected.png
rename to third_party/blink/web_tests/compositing/overflow/mask-with-filter-expected.png
Binary files differ

third_party/blink/web_tests/compositing/overflow/rotate-then-clip-z-order-interleave-expected.png

diff --git a/third_party/blink/web_tests/platform/win/compositing/overflow/rotate-then-clip-z-order-interleave-expected.png b/third_party/blink/web_tests/compositing/overflow/rotate-then-clip-z-order-interleave-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/compositing/overflow/rotate-then-clip-z-order-interleave-expected.png
rename to third_party/blink/web_tests/compositing/overflow/rotate-then-clip-z-order-interleave-expected.png
Binary files differ

third_party/blink/web_tests/compositing/perpendicular-layer-sorting-expected.png

diff --git a/third_party/blink/web_tests/platform/win/compositing/perpendicular-layer-sorting-expected.png b/third_party/blink/web_tests/compositing/perpendicular-layer-sorting-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/compositing/perpendicular-layer-sorting-expected.png
rename to third_party/blink/web_tests/compositing/perpendicular-layer-sorting-expected.png
Binary files differ

third_party/blink/web_tests/css3/filters/effect-reference-hidpi-hw-expected.png

diff --git a/third_party/blink/web_tests/css3/filters/effect-reference-hidpi-hw-expected.png b/third_party/blink/web_tests/css3/filters/effect-reference-hidpi-hw-expected.png
index 10c080f..35e0529 100644
--- a/third_party/blink/web_tests/css3/filters/effect-reference-hidpi-hw-expected.png
+++ b/third_party/blink/web_tests/css3/filters/effect-reference-hidpi-hw-expected.png
Binary files differ

third_party/blink/web_tests/css3/filters/effect-reference-ordering-hw-expected.png

diff --git a/third_party/blink/web_tests/css3/filters/effect-reference-ordering-hw-expected.png b/third_party/blink/web_tests/css3/filters/effect-reference-ordering-hw-expected.png
index 3d814eac..12db1a0 100644
--- a/third_party/blink/web_tests/css3/filters/effect-reference-ordering-hw-expected.png
+++ b/third_party/blink/web_tests/css3/filters/effect-reference-ordering-hw-expected.png
Binary files differ

third_party/blink/web_tests/css3/filters/effect-reference-zoom-hw-expected.png

diff --git a/third_party/blink/web_tests/platform/win/css3/filters/effect-reference-zoom-hw-expected.png b/third_party/blink/web_tests/css3/filters/effect-reference-zoom-hw-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/css3/filters/effect-reference-zoom-hw-expected.png
rename to third_party/blink/web_tests/css3/filters/effect-reference-zoom-hw-expected.png
Binary files differ

third_party/blink/web_tests/css3/filters/filter-repaint-composited-fallback-crash-expected.png

diff --git a/third_party/blink/web_tests/platform/win/css3/filters/filter-repaint-composited-fallback-crash-expected.png b/third_party/blink/web_tests/css3/filters/filter-repaint-composited-fallback-crash-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/css3/filters/filter-repaint-composited-fallback-crash-expected.png
rename to third_party/blink/web_tests/css3/filters/filter-repaint-composited-fallback-crash-expected.png
Binary files differ

third_party/blink/web_tests/css3/filters/filter-repaint-composited-fallback-expected.png

diff --git a/third_party/blink/web_tests/platform/win/css3/filters/filter-repaint-composited-fallback-expected.png b/third_party/blink/web_tests/css3/filters/filter-repaint-composited-fallback-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/css3/filters/filter-repaint-composited-fallback-expected.png
rename to third_party/blink/web_tests/css3/filters/filter-repaint-composited-fallback-expected.png
Binary files differ

third_party/blink/web_tests/external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-009.html

diff --git a/third_party/blink/web_tests/external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-009.html b/third_party/blink/web_tests/external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-009.html
new file mode 100644
index 0000000..b9283be2
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-009.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<title>
+  Tests that a flexbox expands its intrinsic block-size, due to a
+  flex item fragmenting.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-flexbox-1/#pagination">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="width: 100px; height: 100px; columns: 2; column-gap: 0; column-fill: auto; background: red;">
+  <div style="display: flex; flex-wrap: wrap; background: green;">
+    <div style="display: flex; flex-wrap: wrap;">
+      <div style="line-height: 0;">
+        <div style="display: inline-block; width: 50px; height: 50px;"></div>
+        <div style="display: inline-block; width: 50px; height: 100px;"></div>
+      </div>
+    </div>
+  </div>
+</div>

third_party/blink/web_tests/external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-010.html

diff --git a/third_party/blink/web_tests/external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-010.html b/third_party/blink/web_tests/external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-010.html
new file mode 100644
index 0000000..7299121
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-010.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<title>
+  Tests that flex-items get pushed down due to a previous flex row expanding as
+  a result of fragmentation.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-flexbox-1/#pagination">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<style>
+  #flex {
+    display: flex;
+    flex-wrap: wrap;
+  }
+  #flex > div {
+    background: green;
+    width: 10px;
+  }
+</style>
+<div style="width: 100px; height: 100px; columns: 5; column-gap: 0; column-fill: auto; background: red;">
+  <div id="flex">
+    <div style="position: relative;">
+      <div style="contain: size; width: 10px; height: 80px;"></div>
+      <div style="contain: size; width: 10px; height: 30px;"></div>
+      <div style="position: absolute; width: 10px; height: 10px; background: green;"></div>
+    </div>
+    <div>
+      <div style="contain: size; width: 10px; height: 70px;"></div>
+      <div style="contain: size; width: 10px; height: 40px;"></div>
+    </div>
+    <div style="position: relative;">
+      <div style="contain: size; width: 10px; height: 40px;"></div>
+      <div style="contain: size; width: 10px; height: 80px;"></div>
+      <div style="position: absolute; width: 10px; height: 50px; background: green;"></div>
+    </div>
+    <div style="position: relative;">
+      <div style="contain: size; width: 10px; height: 80px;"></div>
+      <div style="contain: size; width: 10px; height: 30px;"></div>
+      <div style="position: absolute; top: -60px; width: 10px; height: 60px; background: green;"></div>
+    </div>
+    <div style="height: 100px; width: 20px;"></div>
+    <div style="height: 70px; width: 20px;"></div>
+  </div>
+</div>

third_party/blink/web_tests/external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-011.html

diff --git a/third_party/blink/web_tests/external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-011.html b/third_party/blink/web_tests/external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-011.html
new file mode 100644
index 0000000..e2e3624
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-011.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<title>
+  Tests that flex-items *don't* get pushed down when there is no expansion.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-flexbox-1/#pagination">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="width: 100px; height: 100px; columns: 2; column-gap: 0; column-fill: auto; background: red;">
+  <div style="display: flex; flex-wrap: wrap;">
+    <div style="line-height: 0; background: green; height: 110px;">
+      <div style="display: inline-block; width: 50px; height: 80px;"></div>
+      <div style="display: inline-block; width: 50px; height: 30px;"></div>
+    </div>
+    <div style="background: green; width: 25px; height: 50px;"></div>
+    <div style="background: green; width: 25px; height: 50px;"></div>
+    <div style="background: green; width: 25px; height: 40px;"></div>
+    <div style="background: green; width: 25px; height: 40px;"></div>
+  </div>
+</div>

third_party/blink/web_tests/external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-012.html

diff --git a/third_party/blink/web_tests/external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-012.html b/third_party/blink/web_tests/external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-012.html
new file mode 100644
index 0000000..bb5af266
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-012.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<title>
+  Tests that flex-items get pushed down due to a previous multicol flex-item
+  expanding as a result of fragmentation.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-flexbox-1/#pagination">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="width: 100px; height: 100px; columns: 2; column-gap: 0; column-fill: auto; background: red;">
+  <div style="display: flex; flex-wrap: wrap;">
+    <div style="width: 50px; columns: 2; column-gap: 0; column-fill: auto; background: green;">
+      <div style="width: 50px; height: 160px;"></div>
+      <div style="column-span: all; height: 30px; break-inside: avoid;"></div>
+    </div>
+    <div style="background: green; height: 50px; width: 50px;"></div>
+    <div style="background: green; height: 20px; width: 50px;"></div>
+  </div>
+</div>

third_party/blink/web_tests/external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-013.html

diff --git a/third_party/blink/web_tests/external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-013.html b/third_party/blink/web_tests/external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-013.html
new file mode 100644
index 0000000..f85ac0b
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-013.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<title>
+  Tests that flex-items get pushed down due to a previous flex-item
+  expanding as a result of its floated child.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-flexbox-1/#pagination">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="width: 100px; height: 100px; columns: 2; column-gap: 0; column-fill: auto; background: red;">
+  <div style="display: flex; flex-wrap: wrap;">
+    <div style="background: green;">
+      <div style="float: left; width: 50px;">
+        <div style="contain: size; width: 50px; height: 80px;"></div>
+        <div style="contain: size; width: 50px; height: 30px;"></div>
+      </div>
+    </div>
+    <div style="background: green; height: 50px; width: 50px;"></div>
+    <div style="background: green; height: 20px; width: 50px;"></div>
+  </div>
+</div>

third_party/blink/web_tests/external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-014.html

diff --git a/third_party/blink/web_tests/external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-014.html b/third_party/blink/web_tests/external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-014.html
new file mode 100644
index 0000000..ac48296
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-014.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<title>
+  Tests that flex-items get pushed down due to a previous flex-item expanding as
+  a result of fragmentation.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-flexbox-1/#pagination">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="width: 100px; height: 100px; columns: 4; column-gap: 0; column-fill: auto; background: red;">
+  <div style="display: flex; flex-wrap: wrap;">
+    <div style="background: green; width: 25px;">
+      <div style="contain: size; width: 25px; height: 60px;"></div>
+      <div style="contain: size; width: 25px; height: 30px;"></div>
+    </div>
+    <div style="background: green; width: 25px; order: -1;">
+      <div style="contain: size; width: 25px; height: 80px;"></div>
+      <div style="contain: size; width: 25px; height: 30px;"></div>
+    </div>
+    <div style="background: green; width: 25px;">
+      <div style="contain: size; width: 25px; height: 20px;"></div>
+      <div style="contain: size; width: 25px; height: 100px;"></div>
+    </div>
+  </div>
+</div>

third_party/blink/web_tests/external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-015.html

diff --git a/third_party/blink/web_tests/external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-015.html b/third_party/blink/web_tests/external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-015.html
new file mode 100644
index 0000000..8b9ebd1
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-015.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<title>
+  Tests that a flexbox expands its intrinsic block-size, due to a
+  flex item fragmenting.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-flexbox-1/#pagination">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<style>
+  #flex {
+    display: flex;
+    flex-wrap: wrap;
+    background: green;
+  }
+  #flex > div {
+    width: 10px;
+  }
+</style>
+<div style="width: 100px; height: 100px; columns: 5; column-gap: 0; column-fill: auto; background: red;">
+  <div id="flex">
+    <div>
+      <div style="contain: size; width: 10px; height: 80px;"></div>
+      <div style="contain: size; width: 10px; height: 30px;"></div>
+    </div>
+    <div>
+      <div style="contain: size; width: 10px; height: 70px;"></div>
+      <div style="contain: size; width: 10px; height: 40px;"></div>
+    </div>
+    <div>
+      <div style="contain: size; width: 10px; height: 40px;"></div>
+      <div style="contain: size; width: 10px; height: 80px;"></div>
+    </div>
+    <div>
+      <div style="contain: size; width: 10px; height: 80px;"></div>
+      <div style="contain: size; width: 10px; height: 30px;"></div>
+    </div>
+    <div style="height: 100px; width: 20px;"></div>
+    <div style="height: 70px; width: 20px;"></div>
+  </div>
+</div>

third_party/blink/web_tests/external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-016.html

diff --git a/third_party/blink/web_tests/external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-016.html b/third_party/blink/web_tests/external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-016.html
new file mode 100644
index 0000000..338d9f2
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-016.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<title>
+  Tests that flex-items get pushed down due to a previous flex row expanding as
+  a result of fragmentation with margin-top.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-flexbox-1/#pagination">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<style>
+  #flex {
+    display: flex;
+    flex-wrap: wrap;
+  }
+  #flex > div {
+    background: green;
+    width: 10px;
+  }
+</style>
+<div style="width: 100px; height: 100px; columns: 5; column-gap: 0; column-fill: auto; background: red;">
+  <div id="flex">
+    <div style="position: relative;">
+      <div style="contain: size; width: 10px; height: 80px;"></div>
+      <div style="contain: size; width: 10px; height: 30px;"></div>
+      <div style="position: absolute; width: 10px; height: 10px; background: green;"></div>
+    </div>
+    <div>
+      <div style="contain: size; width: 10px; height: 70px;"></div>
+      <div style="contain: size; width: 10px; height: 40px;"></div>
+    </div>
+    <div style="margin-top: 10px; width: 20px; position: relative;">
+      <div style="contain: size; width: 20px; height: 80px;"></div>
+      <div style="contain: size; width: 20px; height: 40px;"></div>
+      <div style="position: absolute; top: -60px; width: 20px; height: 60px; background: green;"></div>
+    </div>
+    <div style="height: 100px; width: 20px;"></div>
+    <div style="height: 60px; width: 20px;"></div>
+  </div>
+</div>

third_party/blink/web_tests/external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-030.html

diff --git a/third_party/blink/web_tests/external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-030.html b/third_party/blink/web_tests/external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-030.html
new file mode 100644
index 0000000..2cf95db5
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-030.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<title>
+  Tests that flex-items get pushed down due to a previous flex row expanding as
+  a result of fragmentation with margin-top.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-flexbox-1/#pagination">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<style>
+  #flex {
+    display: flex;
+    flex-direction: column;
+  }
+  #flex > div {
+    background: green;
+    width: 20px;
+  }
+</style>
+<div style="width: 100px; height: 100px; columns: 5; column-gap: 0; column-fill: auto; background: red;">
+  <div id="flex">
+    <div>
+      <div style="contain: size; width: 20px; height: 70px;"></div>
+      <div style="contain: size; width: 20px; height: 40px;"></div>
+    </div>
+    <div style="margin-top: 10px; width: 20px; position: relative;">
+      <div style="contain: size; width: 20px; height: 80px;"></div>
+      <div style="contain: size; width: 20px; height: 40px;"></div>
+      <div style="position: absolute; top: -60px; width: 20px; height: 60px; background: green;"></div>
+    </div>
+    <div style="height: 100px; width: 20px;"></div>
+    <div style="height: 60px; width: 20px;"></div>
+  </div>
+</div>

third_party/blink/web_tests/external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-031.html

diff --git a/third_party/blink/web_tests/external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-031.html b/third_party/blink/web_tests/external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-031.html
new file mode 100644
index 0000000..4f18430b
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-031.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<title>
+  Tests that a flexbox expands its intrinsic block-size, due to a
+  flex item fragmenting.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-flexbox-1/#pagination">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<style>
+  #flex {
+    display: flex;
+    flex-direction: column;
+    background: green;
+  }
+  #flex > div {
+    width: 20px;
+  }
+</style>
+<div style="width: 100px; height: 100px; columns: 5; column-gap: 0; column-fill: auto; background: red;">
+  <div id="flex">
+    <div>
+      <div style="contain: size; width: 20px; height: 70px;"></div>
+      <div style="contain: size; width: 20px; height: 40px;"></div>
+    </div>
+    <div style="margin-top: 10px; width: 20px;">
+      <div style="contain: size; width: 20px; height: 80px;"></div>
+      <div style="contain: size; width: 20px; height: 40px;"></div>
+    </div>
+    <div style="height: 100px; width: 20px;"></div>
+    <div style="height: 60px; width: 20px;"></div>
+  </div>
+</div>

third_party/blink/web_tests/external/wpt/css/css-break/flexbox/single-line-row-flex-fragmentation-009.html

diff --git a/third_party/blink/web_tests/external/wpt/css/css-break/flexbox/single-line-row-flex-fragmentation-009.html b/third_party/blink/web_tests/external/wpt/css/css-break/flexbox/single-line-row-flex-fragmentation-009.html
new file mode 100644
index 0000000..b51c7883
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-break/flexbox/single-line-row-flex-fragmentation-009.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<title>
+  Tests that a flexbox expands its intrinsic block-size, due to a
+  flex item fragmenting.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-flexbox-1/#pagination">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="width: 100px; height: 100px; columns: 2; column-gap: 0; column-fill: auto; background: red;">
+  <div style="display: flex; background: green;">
+    <div style="display: flex;">
+      <div style="line-height: 0;">
+        <div style="display: inline-block; width: 50px; height: 50px;"></div>
+        <div style="display: inline-block; width: 50px; height: 100px;"></div>
+      </div>
+    </div>
+  </div>
+</div>

third_party/blink/web_tests/external/wpt/css/css-break/flexbox/single-line-row-flex-fragmentation-010.html

diff --git a/third_party/blink/web_tests/external/wpt/css/css-break/flexbox/single-line-row-flex-fragmentation-010.html b/third_party/blink/web_tests/external/wpt/css/css-break/flexbox/single-line-row-flex-fragmentation-010.html
new file mode 100644
index 0000000..cd952e7
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-break/flexbox/single-line-row-flex-fragmentation-010.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<title>
+  Tests that flex-items in the same flex row *don't* get pushed down due to a
+  previous flex item expanding as a result of fragmentation.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-flexbox-1/#pagination">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="width: 100px; height: 100px; columns: 2; column-gap: 0; column-fill: auto; background: red;">
+  <div style="display: flex;">
+    <div style="background: green;">
+      <div style="contain: size; width: 25px; height: 80px;"></div>
+      <div style="contain: size; width: 25px; height: 30px;"></div>
+    </div>
+    <div style="height: 200px; width:25px; background: green;"></div>
+  </div>
+</div>

third_party/blink/web_tests/external/wpt/css/css-break/flexbox/single-line-row-flex-fragmentation-011.html

diff --git a/third_party/blink/web_tests/external/wpt/css/css-break/flexbox/single-line-row-flex-fragmentation-011.html b/third_party/blink/web_tests/external/wpt/css/css-break/flexbox/single-line-row-flex-fragmentation-011.html
new file mode 100644
index 0000000..cf1c6b7
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-break/flexbox/single-line-row-flex-fragmentation-011.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<title>
+  Tests that flex-items *don't* get pushed down when there is no expansion.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-flexbox-1/#pagination">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="width: 100px; height: 100px; columns: 2; column-gap: 0; column-fill: auto; background: red;">
+  <div style="display: flex;">
+    <div style="background: green; height: 110px; position: relative;">
+      <div style="contain: size; width: 25px; height: 80px;"></div>
+      <div style="contain: size; width: 25px; height: 30px;"></div>
+      <div style="position: absolute; top: 110px; height: 90px; width: 25px; background: green;"></div>
+    </div>
+    <div style="background: green; width: 25px; height: 200px;"></div>
+  </div>
+</div>

third_party/blink/web_tests/external/wpt/css/selectors/invalidation/input-pseudo-classes-in-has.html

diff --git a/third_party/blink/web_tests/external/wpt/css/selectors/invalidation/input-pseudo-classes-in-has.html b/third_party/blink/web_tests/external/wpt/css/selectors/invalidation/input-pseudo-classes-in-has.html
new file mode 100644
index 0000000..e305f59
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/selectors/invalidation/input-pseudo-classes-in-has.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<title>CSS Selectors Invalidation: input pseudo classes in :has() argument</title>
+<link rel="author" title="Byungwoo Lee" href="blee@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/selectors/#relational">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<style>
+  .ancestor:has(input:checked) { color: green }
+  .ancestor:has(input:indeterminate) { color: yellowgreen }
+</style>
+<div id=subject class=ancestor>
+  <div>
+    <input type="checkbox" name="my-checkbox" id="checkme">
+    <label for="checkme">Check me!</label>
+  </div>
+</div>
+<script>
+  test(() => {
+    checkme.checked = false;
+    assert_equals(getComputedStyle(subject).color, "rgb(0, 0, 0)",
+                  "ancestor should be black");
+    checkme.checked = true;
+    assert_equals(getComputedStyle(subject).color, "rgb(0, 128, 0)",
+                  "ancestor should be green");
+    checkme.indeterminate = true;
+    assert_equals(getComputedStyle(subject).color, "rgb(154, 205, 50)",
+                  "ancestor should be yellowgreen");
+    checkme.remove();
+    assert_equals(getComputedStyle(subject).color, "rgb(0, 0, 0)",
+                  "ancestor should be black");
+
+    {
+      const input = document.createElement('input');
+      input.id = 'checkme';
+      input.setAttribute('type', 'checkbox');
+      input.setAttribute('name', 'my-checkbox');
+      input.checked = true;
+      assert_equals(getComputedStyle(subject).color, "rgb(0, 0, 0)",
+                    "ancestor should be black");
+      subject.prepend(input);
+      assert_equals(getComputedStyle(subject).color, "rgb(0, 128, 0)",
+                    "ancestor should be green");
+    }
+
+      });
+</script>
\ No newline at end of file

third_party/blink/web_tests/external/wpt/css/selectors/invalidation/user-action-pseudo-classes-in-has.html

diff --git a/third_party/blink/web_tests/external/wpt/css/selectors/invalidation/user-action-pseudo-classes-in-has.html b/third_party/blink/web_tests/external/wpt/css/selectors/invalidation/user-action-pseudo-classes-in-has.html
new file mode 100644
index 0000000..bb6be82
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/selectors/invalidation/user-action-pseudo-classes-in-has.html
@@ -0,0 +1,90 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<title>CSS Selectors Invalidation: user-action pseudo classes in :has() argument</title>
+<link rel="author" title="Byungwoo Lee" href="blee@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/selectors/#relational">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<style>
+  .ancestor:has(.descendant1:hover) { color: blue }
+  .ancestor:has(.descendant1:hover:active) { color: skyblue }
+  .ancestor:has(:focus) { color: green }
+  .ancestor:has(.descendant2:focus-visible) { color: yellowgreen }
+  .ancestor:has(.descendant3:focus-within) { color: lightgreen }
+</style>
+<div id=subject1 class=ancestor>
+  <div>
+    <div id=hoverme class=descendant1>Hover and click me</div>
+    <div id=focusme1 tabindex=1>Focus me</div>
+    <div id=focusme2 class=descendant2 tabindex=2>Focus me</div>
+    <div class=descendant3>
+      <div><div id=focusme3 tabindex=3>Focus me</div></div>
+    </div>
+  </div>
+</div>
+<div id=subject2 class=ancestor>
+  <div id=focusme4 tabindex=4>Focus me</div>
+</div>
+<script>
+  const tab_key = '\ue004';
+
+  async_test(function(t) {
+    hoverme.addEventListener("mouseover", t.step_func(event => {
+      assert_equals(getComputedStyle(subject1).color, "rgb(0, 0, 255)",
+                    "subject1 should be blue");
+    }));
+    hoverme.addEventListener("mousedown", t.step_func(event => {
+      assert_equals(getComputedStyle(subject1).color, "rgb(135, 206, 235)",
+                    "subject1 should be skyblue");
+    }));
+    hoverme.addEventListener("mouseup", t.step_func(event => {
+      assert_equals(getComputedStyle(subject1).color, "rgb(0, 0, 255)",
+                    "subject1 should be blue again");
+    }));
+    focusme1.addEventListener("focus", t.step_func(function() {
+      assert_equals(getComputedStyle(subject1).color, "rgb(0, 128, 0)",
+                    "subject1 should be green");
+      test_driver.send_keys(document.body, tab_key);
+    }));
+    focusme2.addEventListener("focus", t.step_func(function() {
+      assert_equals(getComputedStyle(subject1).color, "rgb(154, 205, 50)",
+                    "subject1 should be yellowgreen");
+      test_driver.send_keys(document.body, tab_key);
+    }));
+    focusme3.addEventListener("focus", t.step_func(function() {
+      assert_equals(getComputedStyle(subject1).color, "rgb(144, 238, 144)",
+                    "subject1 should be lightgreen");
+
+      focusme3.remove();
+      assert_equals(getComputedStyle(subject1).color, "rgb(0, 0, 0)",
+                    "subject1 should be black");
+
+      test_driver.send_keys(document.body, tab_key);
+    }));
+    focusme4.addEventListener("focus", t.step_func_done(function() {
+      assert_equals(getComputedStyle(subject2).color, "rgb(0, 128, 0)",
+                    "subject2 should be green");
+
+      focusme4.remove();
+      assert_equals(getComputedStyle(subject2).color, "rgb(0, 0, 0)",
+                    "subject2 should be black");
+    }));
+  }, "Invalidation with :focus, :focus-within, :focus-visible in :has()");
+
+  test(() => {
+    assert_equals(getComputedStyle(subject1).color, "rgb(0, 0, 0)");
+    assert_equals(getComputedStyle(subject2).color, "rgb(0, 0, 0)");
+  }, "ancestor should be black");
+
+  new test_driver.Actions()
+      .pointerMove(0, 0, {origin: hoverme})
+      .pointerDown()
+      .pointerUp()
+      .pointerMove(0, 0, {origin: focusme1})
+      .pointerDown()
+      .pointerUp()
+      .send();
+</script>
\ No newline at end of file

third_party/blink/web_tests/external/wpt/html/semantics/forms/the-selectmenu-element/selectmenu-events.tentative.html

diff --git a/third_party/blink/web_tests/external/wpt/html/semantics/forms/the-selectmenu-element/selectmenu-events.tentative.html b/third_party/blink/web_tests/external/wpt/html/semantics/forms/the-selectmenu-element/selectmenu-events.tentative.html
index 89069e4..99a1bee 100644
--- a/third_party/blink/web_tests/external/wpt/html/semantics/forms/the-selectmenu-element/selectmenu-events.tentative.html
+++ b/third_party/blink/web_tests/external/wpt/html/semantics/forms/the-selectmenu-element/selectmenu-events.tentative.html
@@ -25,6 +25,17 @@
   <option>three</option>
 </selectmenu>
 
+<selectmenu id="selectMenu2">
+  <option>one</option>
+  <option>two</option>
+  <option>three</option>
+</selectmenu>
+
+<selectmenu id="selectMenu3">
+  <option>same</option>
+  <option>same</option>
+</selectmenu>
+
 <script>
 
   function clickOn(element) {
@@ -96,4 +107,68 @@
     await clickOn(selectMenuButton);
     return Promise.all([selectMenuButtonPromise, selectMenuPromise]);
   }, "Listbox controller code should not run if the click event is preventDefaulted.");
+
+  promise_test(async () => {
+    const selectMenu = document.getElementById("selectMenu2");
+    let input_event_count = 0;
+    let change_event_count = 0;
+
+    selectMenu.addEventListener("input", (e) => {
+      assert_true(e.composed, "input event should be composed");
+      assert_equals(input_event_count, 0, "input event should not fire twice");
+      assert_equals(change_event_count, 0, "input event should not fire before change");
+      input_event_count++;
+    });
+    selectMenu.addEventListener("change", (e) => {
+      assert_false(e.composed, "change event should not be composed");
+      assert_equals(input_event_count, 1, "change event should fire after input");
+      assert_equals(change_event_count, 0, "change event should not fire twice");
+      change_event_count++;
+    });
+
+    await clickOn(selectMenu);
+    assert_true(selectMenu.open);
+    await test_driver.send_keys(selectMenu, KEY_CODE_MAP.Enter);
+    assert_false(selectMenu.open);
+    assert_equals(selectMenu.value, "one");
+    assert_equals(input_event_count, 0, "input event shouldn't fire if value wasn't changed");
+    assert_equals(change_event_count, 0, "change event shouldn't fire if value wasn't changed");
+
+    await clickOn(selectMenu);
+    assert_true(selectMenu.open);
+    await test_driver.send_keys(selectMenu, KEY_CODE_MAP.ArrowDown);
+    assert_equals(input_event_count, 0, "input event shouldn't fire until popup is closed");
+    assert_equals(change_event_count, 0, "change event shouldn't fire until popup is closed");
+
+    await test_driver.send_keys(selectMenu, KEY_CODE_MAP.Enter);
+    assert_equals(selectMenu.value, "two");
+    assert_equals(input_event_count, 1, "input event should have fired");
+    assert_equals(change_event_count, 1, "change event should have fired");
+  }, "<selectmenu> should fire input and change events when new option is selected");
+
+  promise_test(async () => {
+    const selectMenu = document.getElementById("selectMenu3");
+    let input_event_count = 0;
+    let change_event_count = 0;
+
+    selectMenu.addEventListener("input", (e) => {
+      assert_true(e.composed, "input event should be composed");
+      assert_equals(input_event_count, 0, "input event should not fire twice");
+      assert_equals(change_event_count, 0, "input event should not fire before change");
+      input_event_count++;
+    });
+    selectMenu.addEventListener("change", (e) => {
+      assert_false(e.composed, "change event should not be composed");
+      assert_equals(input_event_count, 1, "change event should fire after input");
+      assert_equals(change_event_count, 0, "change event should not fire twice");
+      change_event_count++;
+    });
+
+    await clickOn(selectMenu);
+    assert_true(selectMenu.open);
+    await test_driver.send_keys(selectMenu, KEY_CODE_MAP.ArrowDown);
+    await test_driver.send_keys(selectMenu, KEY_CODE_MAP.Enter);
+    assert_equals(input_event_count, 1, "input event should have fired");
+    assert_equals(change_event_count, 1, "change event should have fired");
+  }, "<selectmenu> should fire input and change events even when new selected option has the same value as the old");
 </script>

third_party/blink/web_tests/external/wpt/html/semantics/forms/the-selectmenu-element/selectmenu-parts-structure.tentative.html

diff --git a/third_party/blink/web_tests/external/wpt/html/semantics/forms/the-selectmenu-element/selectmenu-parts-structure.tentative.html b/third_party/blink/web_tests/external/wpt/html/semantics/forms/the-selectmenu-element/selectmenu-parts-structure.tentative.html
index 958fb17..97a9698 100644
--- a/third_party/blink/web_tests/external/wpt/html/semantics/forms/the-selectmenu-element/selectmenu-parts-structure.tentative.html
+++ b/third_party/blink/web_tests/external/wpt/html/semantics/forms/the-selectmenu-element/selectmenu-parts-structure.tentative.html
@@ -143,6 +143,12 @@
   </div>
 </selectmenu>
 
+<selectmenu id="selectMenu14">
+  <div slot="button" behavior="button" id="selectMenu14-button0">button0</div>
+  <option>one</option>
+  <option id="selectMenu14-option2">two</option>
+</selectmenu>
+
 <script>
   function clickOn(element) {
     const actions = new test_driver.Actions();
@@ -443,4 +449,40 @@
     selectMenuOption4.click();
     assert_equals(selectMenu.value, "");
   }, "Controller code should be updated when nested parts are removed");
+
+  promise_test(async () => {
+    let selectMenu = document.getElementById("selectMenu14");
+    assert_equals(selectMenu.value, "one");
+    const selectMenuButton0 = document.getElementById("selectMenu14-button0");
+    const selectMenuOption2 = document.getElementById("selectMenu14-option2");
+
+    selectMenuButton0.click();
+    assert_true(selectMenu.open);
+    await clickOn(selectMenuOption2);
+    assert_equals(selectMenu.value, "two");
+
+    document.body.removeChild(selectMenu);
+    selectMenu.removeChild(selectMenuOption2);
+    assert_equals(selectMenu.value, "one");
+    let newOption = document.createElement("option");
+    newOption.innerText = "three";
+    selectMenu.appendChild(newOption);
+    newOption.click();
+    assert_equals(selectMenu.value, "three", "New option should receive controller code");
+
+    let doc = document.implementation.createHTMLDocument('');
+    let selectMenu1 = doc.createElement('selectmenu');
+    let firstOption = doc.createElement('option');
+    firstOption.innerText = 'one';
+    let secondOption = doc.createElement('option');
+    secondOption.innerText = 'two';
+    selectMenu1.appendChild(firstOption);
+    selectMenu1.appendChild(secondOption);
+    assert_equals(selectMenu1.value, "one");
+    secondOption.click();
+    assert_equals(selectMenu1.value, "two");
+    document.body.appendChild(selectMenu1);
+    selectMenu1.removeChild(secondOption);
+    assert_equals(selectMenu1.value, "one");
+  }, "Moving a selectmenu between documents should keep controller code active");
 </script>

third_party/blink/web_tests/fast/frames/frame-set-scaling-rotate-expected.png

diff --git a/third_party/blink/web_tests/platform/win/fast/frames/frame-set-scaling-rotate-expected.png b/third_party/blink/web_tests/fast/frames/frame-set-scaling-rotate-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/fast/frames/frame-set-scaling-rotate-expected.png
rename to third_party/blink/web_tests/fast/frames/frame-set-scaling-rotate-expected.png
Binary files differ

third_party/blink/web_tests/fast/frames/frame-set-scaling-skew-expected.png

diff --git a/third_party/blink/web_tests/platform/win/fast/frames/frame-set-scaling-skew-expected.png b/third_party/blink/web_tests/fast/frames/frame-set-scaling-skew-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/fast/frames/frame-set-scaling-skew-expected.png
rename to third_party/blink/web_tests/fast/frames/frame-set-scaling-skew-expected.png
Binary files differ

third_party/blink/web_tests/fast/webgl/pixelated-expected.png

diff --git a/third_party/blink/web_tests/fast/webgl/pixelated-expected.png b/third_party/blink/web_tests/fast/webgl/pixelated-expected.png
deleted file mode 100644
index 791a4cf..0000000
--- a/third_party/blink/web_tests/fast/webgl/pixelated-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/fast/webgl/webgl-composite-modes-expected.png

diff --git a/third_party/blink/web_tests/fast/webgl/webgl-composite-modes-expected.png b/third_party/blink/web_tests/fast/webgl/webgl-composite-modes-expected.png
deleted file mode 100644
index d8d3ac81..0000000
--- a/third_party/blink/web_tests/fast/webgl/webgl-composite-modes-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/accessibility/css-styles-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/accessibility/css-styles-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/accessibility/css-styles-expected.txt
index 18cec96..4a6ee406 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/accessibility/css-styles-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/accessibility/css-styles-expected.txt
@@ -3,13 +3,13 @@
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 PASS axHeading.color is 16711680
-FAIL axHeading.fontSize should be 12. Was 18.
+PASS axHeading.fontSize is 12
 PASS axParagraph.color is 65280
-FAIL axParagraph.fontSize should be 14. Was 21.
+PASS axParagraph.fontSize is 14
 PASS axButton.color is 255
-FAIL axButton.fontSize should be 16. Was 24.
+PASS axButton.fontSize is 16
 PASS axText.color is 255
-FAIL axText.fontSize should be 16. Was 24.
+PASS axText.fontSize is 16
 PASS successfullyParsed is true
 
 TEST COMPLETE

third_party/blink/web_tests/flag-specific/highdpi/accessibility/font-changed-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/accessibility/font-changed-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/accessibility/font-changed-expected.txt
index a91841a..083f68b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/accessibility/font-changed-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/accessibility/font-changed-expected.txt
@@ -1,5 +1,5 @@
 This is a testharness.js-based test.
 PASS Ensures that the font family can be dynamically changed.
-FAIL Ensures that the font size can be dynamically changed. assert_equals: expected 32 but got 48
+PASS Ensures that the font size can be dynamically changed.
 Harness: the test ran to completion.
 

third_party/blink/web_tests/flag-specific/highdpi/animations/interpolation/clip-path-interpolation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/animations/interpolation/clip-path-interpolation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/animations/interpolation/clip-path-interpolation-expected.txt
index a41f0b1..ec0cff2 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/animations/interpolation/clip-path-interpolation-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/animations/interpolation/clip-path-interpolation-expected.txt
@@ -1,8 +1,8 @@
 This is a testharness.js-based test.
 PASS This test uses interpolation-test.js.
-FAIL CSS Transitions: property <clip-path> from [inset(20px)] to [inset(40%)] at (3.40282e+38) is [inset(calc(3.40282e+38% - 2.26855e+38px))] assert_equals: expected "inset ( calc ( 3.4e + 38 % - infpx ) ) " but got "inset ( calc ( 3.4e + 38 % - 2.27e + 38px ) ) "
-FAIL CSS Transitions with transition: all: property <clip-path> from [inset(20px)] to [inset(40%)] at (3.40282e+38) is [inset(calc(3.40282e+38% - 2.26855e+38px))] assert_equals: expected "inset ( calc ( 3.4e + 38 % - infpx ) ) " but got "inset ( calc ( 3.4e + 38 % - 2.27e + 38px ) ) "
-FAIL CSS Animations: property <clip-path> from [inset(20px)] to [inset(40%)] at (3.40282e+38) is [inset(calc(3.40282e+38% - 2.26855e+38px))] assert_equals: expected "inset ( calc ( 3.4e + 38 % - infpx ) ) " but got "inset ( calc ( 3.4e + 38 % - 2.27e + 38px ) ) "
-FAIL Web Animations: property <clip-path> from [inset(20px)] to [inset(40%)] at (3.40282e+38) is [inset(calc(3.40282e+38% - 2.26855e+38px))] assert_equals: expected "inset ( calc ( 3.4e + 38 % - infpx ) ) " but got "inset ( calc ( 3.4e + 38 % - 2.27e + 38px ) ) "
+PASS CSS Transitions: property <clip-path> from [inset(20px)] to [inset(40%)] at (3.40282e+38) is [inset(calc(3.40282e+38% - 2.26855e+38px))]
+PASS CSS Transitions with transition: all: property <clip-path> from [inset(20px)] to [inset(40%)] at (3.40282e+38) is [inset(calc(3.40282e+38% - 2.26855e+38px))]
+PASS CSS Animations: property <clip-path> from [inset(20px)] to [inset(40%)] at (3.40282e+38) is [inset(calc(3.40282e+38% - 2.26855e+38px))]
+PASS Web Animations: property <clip-path> from [inset(20px)] to [inset(40%)] at (3.40282e+38) is [inset(calc(3.40282e+38% - 2.26855e+38px))]
 Harness: the test ran to completion.
 

third_party/blink/web_tests/flag-specific/highdpi/compositing/absolute-inside-out-of-view-fixed-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/absolute-inside-out-of-view-fixed-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/absolute-inside-out-of-view-fixed-expected.txt
index bffda26c..63f2146 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/absolute-inside-out-of-view-fixed-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/absolute-inside-out-of-view-fixed-expected.txt
@@ -1,23 +1,22 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 3770],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "transform": 1
     },
     {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='fixed'",
+      "name": "LayoutNGBlockFlow (positioned) DIV class='wrapper box'",
       "bounds": [150, 150],
       "contentsOpaque": true,
       "backgroundColor": "#008000"
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/background-color/background-color-coverage-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/background-color/background-color-coverage-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/background-color/background-color-coverage-expected.txt
index 05b56cb..3010fc8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/background-color/background-color-coverage-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/background-color/background-color-coverage-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -22,80 +22,89 @@
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='green3'",
       "bounds": [165, 165],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#008000",
       "transform": 2
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='brown1'",
       "bounds": [150, 150],
+      "contentsOpaque": true,
       "backgroundColor": "#664C00",
       "transform": 3
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='brown2'",
       "bounds": [150, 150],
+      "contentsOpaque": true,
       "backgroundColor": "#664C00",
       "transform": 4
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='brown3'",
       "bounds": [150, 150],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
       "transform": 5
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
-      "position": [0, 128],
-      "bounds": [128, 22],
+      "name": "LayoutNGBlockFlow (positioned) DIV id='brown3'",
+      "bounds": [128, 128],
+      "drawsContent": false,
       "transform": 5
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "position": [128, 0],
-      "bounds": [22, 128],
-      "transform": 5
-    },
-    {
-      "name": "Scroll Corner Layer",
-      "position": [128, 128],
-      "bounds": [22, 22],
-      "transform": 5
-    },
-    {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow (positioned) DIV id='brown3'",
       "bounds": [128, 15000],
       "contentsOpaque": true,
       "backgroundColor": "#664C00",
       "transform": 5
     },
     {
+      "name": "HorizontalScrollbar",
+      "position": [0, 128],
+      "bounds": [150, 22],
+      "contentsOpaqueForText": true,
+      "transform": 5
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [128, 0],
+      "bounds": [22, 128],
+      "transform": 5
+    },
+    {
       "name": "LayoutNGBlockFlow (positioned) DIV id='brown4'",
       "bounds": [150, 150],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
       "transform": 6
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
-      "position": [0, 128],
-      "bounds": [128, 22],
+      "name": "LayoutNGBlockFlow (positioned) DIV id='brown4'",
+      "bounds": [128, 128],
+      "drawsContent": false,
       "transform": 6
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "position": [128, 0],
-      "bounds": [22, 128],
-      "transform": 6
-    },
-    {
-      "name": "Scroll Corner Layer",
-      "position": [128, 128],
-      "bounds": [22, 22],
-      "transform": 6
-    },
-    {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow (positioned) DIV id='brown4'",
       "bounds": [128, 15000],
       "contentsOpaque": true,
       "backgroundColor": "#664C00",
       "transform": 6
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 128],
+      "bounds": [150, 22],
+      "contentsOpaqueForText": true,
+      "transform": 6
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [128, 0],
+      "bounds": [22, 128],
+      "transform": 6
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/background-color/view-blending-base-background-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/background-color/view-blending-base-background-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/background-color/view-blending-base-background-expected.txt
index 742d5f3..d67e227 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/background-color/view-blending-base-background-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/background-color/view-blending-base-background-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#7F7FBF"

third_party/blink/web_tests/flag-specific/highdpi/compositing/clip-child-by-non-stacking-ancestor-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/clip-child-by-non-stacking-ancestor-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/clip-child-by-non-stacking-ancestor-expected.txt
index 439cb65..a15eb53 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/clip-child-by-non-stacking-ancestor-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/clip-child-by-non-stacking-ancestor-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/background-clip-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/background-clip-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/background-clip-expected.txt
index 7f305f4c5..f0283ba 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/background-clip-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/background-clip-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -16,12 +16,14 @@
     {
       "name": "LayoutNGBlockFlow DIV class='box composited padding-clip'",
       "bounds": [150, 150],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#008000",
       "transform": 2
     },
     {
       "name": "LayoutNGBlockFlow DIV class='box composited content-clip'",
       "bounds": [150, 150],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#008000",
       "transform": 3
     }

third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/background-color-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/background-color-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/background-color-expected.txt
index e090474..f285930 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/background-color-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/background-color-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,12 +9,14 @@
     {
       "name": "LayoutNGBlockFlow DIV class='box composited'",
       "bounds": [150, 150],
+      "contentsOpaqueForText": true,
       "drawsContent": false,
       "transform": 1
     },
     {
       "name": "LayoutNGBlockFlow DIV class='box translucent composited'",
       "bounds": [150, 150],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#00FF0080",
       "transform": 2
     },

third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/body-background-painted-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/body-background-painted-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/body-background-painted-expected.txt
index 687c64d..2561819 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/body-background-painted-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/body-background-painted-expected.txt
@@ -1,16 +1,12 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#D3D3D3"
     },
     {
-      "name": "LayoutNGBlockFlow HTML",
-      "bounds": [1200, 900]
-    },
-    {
       "name": "LayoutNGBlockFlow (positioned) DIV id='underbody'",
       "bounds": [300, 300],
       "contentsOpaque": true,
@@ -18,8 +14,11 @@
       "transform": 1
     },
     {
-      "name": "LayoutNGBlockFlow HTML (foreground) Layer",
-      "bounds": [1200, 900]
+      "name": "LayoutNGBlockFlow HTML",
+      "position": [12, 12],
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#0000FF"
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/body-background-skipped-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/body-background-skipped-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/body-background-skipped-expected.txt
index dd7852f..b1e6eefa 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/body-background-skipped-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/body-background-skipped-expected.txt
@@ -1,16 +1,12 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#0000FF"
     },
     {
-      "name": "LayoutNGBlockFlow HTML",
-      "bounds": [1200, 900]
-    },
-    {
       "name": "LayoutNGBlockFlow (positioned) DIV id='underbody'",
       "bounds": [300, 300],
       "contentsOpaque": true,
@@ -18,8 +14,11 @@
       "transform": 1
     },
     {
-      "name": "LayoutNGBlockFlow HTML (foreground) Layer",
-      "bounds": [1200, 900]
+      "name": "LayoutNGBlockFlow HTML",
+      "position": [12, 12],
+      "bounds": [150, 150],
+      "contentsOpaqueForText": true,
+      "drawsContent": false
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/control-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/control-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/control-layer-expected.txt
index ff189e7..ef5ea8f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/control-layer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/control-layer-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,6 +9,7 @@
     {
       "name": "LayoutNGButton INPUT id='control' class='composited'",
       "bounds": [194, 32],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#EFEFEF",
       "transform": 1
     }

third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/filter-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/filter-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/filter-expected.txt
index 43c892c..fc3c2626 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/filter-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/filter-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,11 +9,13 @@
     {
       "name": "LayoutNGBlockFlow DIV class='composited container-box'",
       "bounds": [150, 150],
+      "contentsOpaqueForText": true,
       "transform": 1
     },
     {
       "name": "LayoutNGBlockFlow DIV class='composited container-box'",
       "bounds": [150, 150],
+      "contentsOpaqueForText": true,
       "transform": 2
     }
   ],

third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/hidden-with-visible-child-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/hidden-with-visible-child-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/hidden-with-visible-child-expected.txt
index b8ce20a..ff939da 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/hidden-with-visible-child-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/hidden-with-visible-child-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,6 +9,7 @@
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='caption'",
       "bounds": [300, 150],
+      "contentsOpaque": true,
       "backgroundColor": "#0000FF",
       "transform": 1
     }

third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/hidden-with-visible-text-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/hidden-with-visible-text-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/hidden-with-visible-text-expected.txt
index c9e0966..86d8663 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/hidden-with-visible-text-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/hidden-with-visible-text-expected.txt
@@ -2,14 +2,15 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='caption'",
-      "bounds": [300, 150],
+      "bounds": [77, 27],
+      "backgroundColor": "#0000FF",
       "transform": 1
     }
   ],

third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/layer-opacity-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/layer-opacity-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/layer-opacity-expected.txt
index 3c216286..2c66087 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/layer-opacity-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/layer-opacity-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/layer-transform-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/layer-transform-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/layer-transform-expected.txt
index 56b9e33..173d62ee 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/layer-transform-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/layer-transform-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/overflow-hidden-child-layers-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/overflow-hidden-child-layers-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/overflow-hidden-child-layers-expected.txt
index b2e8351..6ff51ec4 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/overflow-hidden-child-layers-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/overflow-hidden-child-layers-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/visibility-hidden-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/visibility-hidden-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/visibility-hidden-expected.txt
index 7f87abd0..36ece76f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/visibility-hidden-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/visibility-hidden-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/compositing/draws-content/canvas-background-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/draws-content/canvas-background-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/draws-content/canvas-background-layer-expected.txt
index e89a60b..2721bf7 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/draws-content/canvas-background-layer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/draws-content/canvas-background-layer-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,11 +9,12 @@
     {
       "name": "LayoutHTMLCanvas CANVAS id='canvas-simple'",
       "bounds": [75, 75],
-      "contentsOpaque": true,
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for LayoutHTMLCanvas CANVAS id='canvas-simple'",
+      "name": "LayoutHTMLCanvas CANVAS id='canvas-simple'",
       "bounds": [75, 75],
       "backgroundColor": "#008000",
       "transform": 1
@@ -21,10 +22,12 @@
     {
       "name": "LayoutHTMLCanvas CANVAS id='canvas-transparent-background'",
       "bounds": [75, 75],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
       "transform": 2
     },
     {
-      "name": "ContentsLayer for LayoutHTMLCanvas CANVAS id='canvas-transparent-background'",
+      "name": "LayoutHTMLCanvas CANVAS id='canvas-transparent-background'",
       "bounds": [75, 75],
       "backgroundColor": "#00FF0080",
       "transform": 2
@@ -37,44 +40,47 @@
       "transform": 3
     },
     {
-      "name": "ContentsLayer for LayoutHTMLCanvas CANVAS id='canvas-padding'",
+      "name": "LayoutHTMLCanvas CANVAS id='canvas-padding'",
       "position": [7, 8],
       "bounds": [75, 75],
       "transform": 3
     },
     {
       "name": "LayoutHTMLCanvas CANVAS id='canvas-border'",
-      "bounds": [90, 90],
-      "contentsOpaque": true,
+      "position": [-1, -1],
+      "bounds": [91, 91],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#008000",
       "transform": 4
     },
     {
-      "name": "ContentsLayer for LayoutHTMLCanvas CANVAS id='canvas-border'",
+      "name": "LayoutHTMLCanvas CANVAS id='canvas-border'",
       "position": [7, 7],
       "bounds": [75, 75],
       "transform": 4
     },
     {
       "name": "LayoutHTMLCanvas CANVAS id='canvas-image'",
-      "bounds": [75, 75],
-      "contentsOpaque": true,
+      "position": [-1, 0],
+      "bounds": [76, 75],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#008000",
       "transform": 5
     },
     {
-      "name": "ContentsLayer for LayoutHTMLCanvas CANVAS id='canvas-image'",
+      "name": "LayoutHTMLCanvas CANVAS id='canvas-image'",
       "bounds": [75, 75],
       "transform": 5
     },
     {
       "name": "LayoutHTMLCanvas CANVAS id='canvas-opaque'",
       "bounds": [75, 75],
-      "contentsOpaque": true,
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
       "transform": 6
     },
     {
-      "name": "ContentsLayer for LayoutHTMLCanvas CANVAS id='canvas-opaque'",
+      "name": "LayoutHTMLCanvas CANVAS id='canvas-opaque'",
       "bounds": [75, 75],
       "contentsOpaque": true,
       "backgroundColor": "#008000",
@@ -82,13 +88,14 @@
     },
     {
       "name": "LayoutHTMLCanvas CANVAS id='canvas-opaque-border'",
-      "bounds": [90, 90],
-      "contentsOpaque": true,
+      "position": [-1, 0],
+      "bounds": [91, 90],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#008000",
       "transform": 7
     },
     {
-      "name": "ContentsLayer for LayoutHTMLCanvas CANVAS id='canvas-opaque-border'",
+      "name": "LayoutHTMLCanvas CANVAS id='canvas-opaque-border'",
       "position": [7, 8],
       "bounds": [75, 75],
       "contentsOpaque": true,
@@ -96,12 +103,14 @@
     },
     {
       "name": "LayoutHTMLCanvas CANVAS id='canvas-opaque-box-shadow'",
-      "bounds": [90, 90],
+      "position": [-1, -1],
+      "bounds": [91, 91],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#008000",
       "transform": 8
     },
     {
-      "name": "ContentsLayer for LayoutHTMLCanvas CANVAS id='canvas-opaque-box-shadow'",
+      "name": "LayoutHTMLCanvas CANVAS id='canvas-opaque-box-shadow'",
       "bounds": [75, 75],
       "contentsOpaque": true,
       "transform": 8

third_party/blink/web_tests/flag-specific/highdpi/compositing/draws-content/webgl-background-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/draws-content/webgl-background-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/draws-content/webgl-background-layer-expected.txt
index 06f8de1..61807c9 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/draws-content/webgl-background-layer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/draws-content/webgl-background-layer-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,11 +9,12 @@
     {
       "name": "LayoutHTMLCanvas CANVAS id='canvas-simple'",
       "bounds": [75, 75],
-      "contentsOpaque": true,
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for LayoutHTMLCanvas CANVAS id='canvas-simple'",
+      "name": "LayoutHTMLCanvas CANVAS id='canvas-simple'",
       "bounds": [75, 75],
       "backgroundColor": "#008000",
       "transform": 1
@@ -26,43 +27,47 @@
       "transform": 2
     },
     {
-      "name": "ContentsLayer for LayoutHTMLCanvas CANVAS id='canvas-padding'",
+      "name": "LayoutHTMLCanvas CANVAS id='canvas-padding'",
       "position": [7, 7],
       "bounds": [75, 75],
       "transform": 2
     },
     {
       "name": "LayoutHTMLCanvas CANVAS id='canvas-border'",
-      "bounds": [90, 90],
-      "contentsOpaque": true,
+      "position": [-1, 0],
+      "bounds": [91, 90],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#008000",
       "transform": 3
     },
     {
-      "name": "ContentsLayer for LayoutHTMLCanvas CANVAS id='canvas-border'",
+      "name": "LayoutHTMLCanvas CANVAS id='canvas-border'",
       "position": [7, 8],
       "bounds": [75, 75],
       "transform": 3
     },
     {
       "name": "LayoutHTMLCanvas CANVAS id='canvas-image'",
-      "bounds": [75, 75],
-      "contentsOpaque": true,
+      "position": [-1, -1],
+      "bounds": [76, 76],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#008000",
       "transform": 4
     },
     {
-      "name": "ContentsLayer for LayoutHTMLCanvas CANVAS id='canvas-image'",
+      "name": "LayoutHTMLCanvas CANVAS id='canvas-image'",
       "bounds": [75, 75],
       "transform": 4
     },
     {
       "name": "LayoutHTMLCanvas CANVAS id='canvas-transparent-background'",
       "bounds": [75, 75],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
       "transform": 5
     },
     {
-      "name": "ContentsLayer for LayoutHTMLCanvas CANVAS id='canvas-transparent-background'",
+      "name": "LayoutHTMLCanvas CANVAS id='canvas-transparent-background'",
       "bounds": [75, 75],
       "backgroundColor": "#00FF0080",
       "transform": 5

third_party/blink/web_tests/flag-specific/highdpi/compositing/filters/sw-layer-overlaps-hw-shadow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/filters/sw-layer-overlaps-hw-shadow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/filters/sw-layer-overlaps-hw-shadow-expected.txt
index 01bb102..dcff70e 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/filters/sw-layer-overlaps-hw-shadow-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/filters/sw-layer-overlaps-hw-shadow-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -14,11 +14,10 @@
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV id='software')",
-      "position": [-158, -158],
+      "name": "LayoutNGBlockFlow (positioned) DIV id='software'",
       "bounds": [150, 150],
-      "backgroundColor": "#008000",
-      "transform": 1
+      "contentsOpaque": true,
+      "backgroundColor": "#008000"
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/filters/sw-nested-shadow-overlaps-hw-nested-shadow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/filters/sw-nested-shadow-overlaps-hw-nested-shadow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/filters/sw-nested-shadow-overlaps-hw-nested-shadow-expected.txt
index 65f675f..0b6e4db 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/filters/sw-nested-shadow-overlaps-hw-nested-shadow-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/filters/sw-nested-shadow-overlaps-hw-nested-shadow-expected.txt
@@ -1,15 +1,23 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='composited-parent'",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#000000",
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='composited-child'",
       "position": [-150, -150],
-      "bounds": [300, 300],
+      "bounds": [150, 150],
+      "contentsOpaqueForText": true,
       "transform": 1
     },
     {
@@ -21,9 +29,8 @@
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='software-child'",
       "position": [150, 150],
-      "bounds": [75, 75],
-      "contentsOpaque": true,
-      "backgroundColor": "#0000FF"
+      "bounds": [150, 150],
+      "contentsOpaqueForText": true
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/filters/sw-shadow-overlaps-hw-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/filters/sw-shadow-overlaps-hw-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/filters/sw-shadow-overlaps-hw-layer-expected.txt
index 70bbd90..63866ce 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/filters/sw-shadow-overlaps-hw-layer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/filters/sw-shadow-overlaps-hw-layer-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -15,9 +15,8 @@
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='software'",
-      "bounds": [150, 150],
-      "contentsOpaque": true,
-      "backgroundColor": "#008000"
+      "bounds": [187, 187],
+      "contentsOpaqueForText": true
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/filters/sw-shadow-overlaps-hw-shadow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/filters/sw-shadow-overlaps-hw-shadow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/filters/sw-shadow-overlaps-hw-shadow-expected.txt
index 46a1d61..dda3da2 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/filters/sw-shadow-overlaps-hw-shadow-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/filters/sw-shadow-overlaps-hw-shadow-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -15,9 +15,8 @@
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='software'",
-      "bounds": [150, 150],
-      "contentsOpaque": true,
-      "backgroundColor": "#008000"
+      "bounds": [187, 187],
+      "contentsOpaqueForText": true
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/fixed-body-background-positioned-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/fixed-body-background-positioned-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/fixed-body-background-positioned-expected.txt
index 7ae3f68..240a9ee 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/fixed-body-background-positioned-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/fixed-body-background-positioned-expected.txt
@@ -2,20 +2,20 @@
   "layers": [
     {
       "name": "LayoutView #document",
-      "bounds": [1200, 900],
+      "bounds": [1178, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow HTML",
       "bounds": [1178, 5550],
+      "contentsOpaqueForText": true,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/fixed-position-changed-to-absolute-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/fixed-position-changed-to-absolute-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/fixed-position-changed-to-absolute-expected.txt
index bbb590b..3432f0f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/fixed-position-changed-to-absolute-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/fixed-position-changed-to-absolute-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#402B3C"
@@ -14,10 +14,25 @@
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV id='layer-A')",
-      "position": [18, 10],
-      "bounds": [339, 270],
-      "transform": 1
+      "name": "LayoutNGBlockFlow (positioned) DIV id='layer-A'",
+      "position": [30, 30],
+      "bounds": [90, 90],
+      "contentsOpaque": true,
+      "backgroundColor": "#6AA6A6"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='layer-B'",
+      "position": [150, 150],
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#F26835"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='layer-C'",
+      "position": [60, 60],
+      "bounds": [309, 39],
+      "contentsOpaque": true,
+      "backgroundColor": "#F2B263"
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/force-compositing-mode/force-composite-empty-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/force-compositing-mode/force-composite-empty-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/force-compositing-mode/force-composite-empty-expected.txt
index 7f87abd0..36ece76f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/force-compositing-mode/force-composite-empty-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/force-compositing-mode/force-composite-empty-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/compositing/force-compositing-mode/no-overflow-iframe-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/force-compositing-mode/no-overflow-iframe-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/force-compositing-mode/no-overflow-iframe-layer-expected.txt
index 7f87abd0..36ece76f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/force-compositing-mode/no-overflow-iframe-layer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/force-compositing-mode/no-overflow-iframe-layer-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/compositing/force-compositing-mode/overflow-hidden-iframe-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/force-compositing-mode/overflow-hidden-iframe-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/force-compositing-mode/overflow-hidden-iframe-layer-expected.txt
index 02a8de1..9a14763 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/force-compositing-mode/overflow-hidden-iframe-layer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/force-compositing-mode/overflow-hidden-iframe-layer-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#0000FF"

third_party/blink/web_tests/flag-specific/highdpi/compositing/force-compositing-mode/overflow-iframe-enter-compositing-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/force-compositing-mode/overflow-iframe-enter-compositing-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/force-compositing-mode/overflow-iframe-enter-compositing-expected.txt
index e2e9ea5..618d885 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/force-compositing-mode/overflow-iframe-enter-compositing-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/force-compositing-mode/overflow-iframe-enter-compositing-expected.txt
@@ -1,33 +1,35 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "Scrolling Contents Layer",
-      "bounds": [762, 774],
-      "backgroundColor": "#0000FF",
-      "transform": 1
-    },
-    {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 203],
       "bounds": [203, 22],
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [203, 0],
       "bounds": [22, 203],
       "transform": 1
     },
     {
-      "name": "Scroll Corner Layer",
+      "name": "Scroll corner of LayoutView #document",
       "position": [203, 203],
       "bounds": [22, 22],
+      "contentsOpaque": true,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow HTML",
+      "bounds": [762, 774],
+      "contentsOpaqueForText": true,
+      "backgroundColor": "#0000FF",
       "transform": 1
     }
   ],

third_party/blink/web_tests/flag-specific/highdpi/compositing/force-compositing-mode/overflow-iframe-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/force-compositing-mode/overflow-iframe-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/force-compositing-mode/overflow-iframe-layer-expected.txt
index e2e9ea5..618d885 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/force-compositing-mode/overflow-iframe-layer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/force-compositing-mode/overflow-iframe-layer-expected.txt
@@ -1,33 +1,35 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "Scrolling Contents Layer",
-      "bounds": [762, 774],
-      "backgroundColor": "#0000FF",
-      "transform": 1
-    },
-    {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 203],
       "bounds": [203, 22],
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [203, 0],
       "bounds": [22, 203],
       "transform": 1
     },
     {
-      "name": "Scroll Corner Layer",
+      "name": "Scroll corner of LayoutView #document",
       "position": [203, 203],
       "bounds": [22, 22],
+      "contentsOpaque": true,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow HTML",
+      "bounds": [762, 774],
+      "contentsOpaqueForText": true,
+      "backgroundColor": "#0000FF",
       "transform": 1
     }
   ],

third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/ancestor-overflow-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/ancestor-overflow-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/ancestor-overflow-change-expected.txt
index 6e6e5956..53a4e38e 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/ancestor-overflow-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/ancestor-overflow-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/bounds-clipped-composited-child-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/bounds-clipped-composited-child-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/bounds-clipped-composited-child-expected.txt
index 8861531..bf17eac 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/bounds-clipped-composited-child-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/bounds-clipped-composited-child-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,6 +9,7 @@
     {
       "name": "LayoutNGBlockFlow DIV class='container'",
       "bounds": [300, 150],
+      "contentsOpaque": true,
       "backgroundColor": "#008000",
       "transform": 2
     }

third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt
index 5f5c47a..eb1485e4 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt
@@ -1,20 +1,31 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='composited'",
+      "name": "LayoutImage (positioned) IMG",
       "position": [15, 15],
-      "bounds": [885, 315]
+      "bounds": [75, 75],
+      "contentsOpaque": true,
+      "backgroundColor": "#000000"
     },
     {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='composited'",
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='inner'",
+      "position": [750, 180],
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#0000FF"
+    },
+    {
+      "name": "LayoutImage (positioned) IMG",
       "position": [15, 15],
-      "bounds": [885, 315],
+      "bounds": [75, 75],
+      "contentsOpaque": true,
+      "backgroundColor": "#000000",
       "transform": 1
     },
     {

third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/bounds-ignores-hidden-dynamic-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/bounds-ignores-hidden-dynamic-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/bounds-ignores-hidden-dynamic-expected.txt
index 3863a87c..f457304 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/bounds-ignores-hidden-dynamic-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/bounds-ignores-hidden-dynamic-expected.txt
@@ -1,18 +1,27 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='composited'",
+      "name": "LayoutImage (positioned) IMG",
       "position": [15, 15],
-      "bounds": [810, 360]
+      "bounds": [75, 75],
+      "contentsOpaque": true,
+      "backgroundColor": "#000000"
     },
     {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='composited'",
+      "name": "LayoutImage (positioned) IMG class='to-visible'",
+      "position": [750, 300],
+      "bounds": [75, 75],
+      "contentsOpaque": true,
+      "backgroundColor": "#000000"
+    },
+    {
+      "name": "LayoutImage (positioned) IMG",
       "position": [15, 15],
       "bounds": [75, 75],
       "contentsOpaque": true,

third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt
index 65368c2..eaa79b3 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt
@@ -1,25 +1,40 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='composited'",
-      "bounds": [750, 375]
+      "bounds": [225, 225],
+      "contentsOpaqueForText": true
+    },
+    {
+      "name": "LayoutImage (positioned) IMG class='to-visible'",
+      "position": [600, 225],
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#000000"
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='composited'",
       "bounds": [225, 225],
+      "contentsOpaqueForText": true,
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow PRE id='layers')",
-      "position": [0, -375],
-      "bounds": [1188, 150],
-      "transform": 1
+      "name": "LayoutNGBlockFlow PRE id='layers'",
+      "position": [12, 12],
+      "bounds": [1176, 22],
+      "drawsContent": false
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='indicator box'",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000"
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='indicator box'",

third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/bounds-ignores-hidden-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/bounds-ignores-hidden-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/bounds-ignores-hidden-expected.txt
index 6029c3c1..364efdb 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/bounds-ignores-hidden-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/bounds-ignores-hidden-expected.txt
@@ -1,34 +1,33 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [67485, 22595],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='composited'",
+      "name": "LayoutImage (positioned) IMG",
       "position": [15, 15],
       "bounds": [75, 75],
       "contentsOpaque": true,
       "backgroundColor": "#000000"
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 878],
-      "bounds": [1178, 22],
-      "contentsOpaque": true
+      "bounds": [1178, 22]
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 878],
-      "contentsOpaque": true
+      "bounds": [22, 878]
     },
     {
-      "name": "Scroll Corner Layer",
+      "name": "Scroll corner of LayoutView #document",
       "position": [1178, 878],
-      "bounds": [22, 22]
+      "bounds": [22, 22],
+      "contentsOpaque": true
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/clip-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/clip-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/clip-expected.txt
index a37721f..ae636890 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/clip-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/clip-expected.txt
@@ -3,7 +3,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -12,12 +12,14 @@
       "name": "LayoutNGBlockFlow (positioned) DIV class='composited box'",
       "position": [-7, -7],
       "bounds": [165, 165],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#666666",
       "transform": 2
     },
     {
       "name": "LayoutNGBlockFlow (relative positioned) DIV class='composited inner'",
       "bounds": [180, 180],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#00000033",
       "transform": 4
     }

third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/clip-inside-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/clip-inside-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/clip-inside-expected.txt
index c6d3b92..e0e3fb3 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/clip-inside-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/clip-inside-expected.txt
@@ -3,7 +3,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -19,6 +19,7 @@
     {
       "name": "LayoutNGBlockFlow (relative positioned) DIV class='composited inner'",
       "bounds": [180, 180],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#00000033",
       "transform": 4
     }

third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/clip-with-shadow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/clip-with-shadow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/clip-with-shadow-expected.txt
index efebd4e5..ca4aa2b1 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/clip-with-shadow-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/clip-with-shadow-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -10,12 +10,14 @@
       "name": "LayoutNGBlockFlow (positioned) DIV class='composited box'",
       "position": [-7, -7],
       "bounds": [165, 165],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#666666",
       "transform": 2
     },
     {
       "name": "LayoutNGBlockFlow (relative positioned) DIV class='composited inner'",
       "bounds": [180, 180],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#00000033",
       "transform": 4
     }

third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/composited-in-columns-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/composited-in-columns-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/composited-in-columns-expected.txt
index b0753a9..07bd916 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/composited-in-columns-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/composited-in-columns-expected.txt
@@ -4,7 +4,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -13,6 +13,7 @@
       "name": "LayoutBlockFlow DIV class='composited block'",
       "position": [-7, -7],
       "bounds": [314, 89],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#0000FF",
       "transform": 1
     },
@@ -27,6 +28,7 @@
       "name": "LayoutBlockFlow DIV class='composited block'",
       "position": [-7, -7],
       "bounds": [314, 89],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#0000FF",
       "transform": 2
     },

third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/flipped-writing-mode-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/flipped-writing-mode-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/flipped-writing-mode-expected.txt
index abbe403..778a9fb4 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/flipped-writing-mode-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/flipped-writing-mode-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -17,6 +17,7 @@
       "name": "LayoutNGBlockFlow DIV class='composited box'",
       "position": [-142, 0],
       "bounds": [292, 150],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#0000FF",
       "transform": 2
     }

third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/foreground-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/foreground-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/foreground-layer-expected.txt
index da6128a..ff9ad86 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/foreground-layer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/foreground-layer-expected.txt
@@ -2,7 +2,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -11,19 +11,23 @@
       "name": "LayoutNGBlockFlow (relative positioned) DIV class='main box'",
       "position": [-45, -45],
       "bounds": [510, 510],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#FF0000",
       "transform": 1
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='negative child'",
       "bounds": [75, 75],
+      "contentsOpaqueForText": true,
       "drawsContent": false,
       "transform": 3
     },
     {
-      "name": "LayoutNGBlockFlow (relative positioned) DIV class='main box' (foreground) Layer",
-      "position": [-45, -45],
-      "bounds": [510, 510],
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='main box'",
+      "position": [60, 60],
+      "bounds": [300, 306],
+      "contentsOpaqueForText": true,
+      "backgroundColor": "#008000",
       "transform": 1
     },
     {
@@ -37,13 +41,16 @@
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='negative child'",
       "bounds": [75, 75],
+      "contentsOpaqueForText": true,
       "drawsContent": false,
       "transform": 6
     },
     {
-      "name": "LayoutNGBlockFlow (relative positioned) DIV class='main box' (foreground) Layer",
-      "position": [-45, -45],
-      "bounds": [510, 510],
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='main box'",
+      "position": [60, 60],
+      "bounds": [300, 300],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
       "transform": 4
     }
   ],

third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/foreground-offset-change-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/foreground-offset-change-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/foreground-offset-change-expected.png
index 82a1bb87..52121513 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/foreground-offset-change-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/foreground-offset-change-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/layer-due-to-layer-children-deep-switch-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/layer-due-to-layer-children-deep-switch-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/layer-due-to-layer-children-deep-switch-expected.txt
index c105a8a..6345671 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/layer-due-to-layer-children-deep-switch-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/layer-due-to-layer-children-deep-switch-expected.txt
@@ -3,7 +3,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -15,7 +15,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -97,7 +97,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/layer-due-to-layer-children-switch-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/layer-due-to-layer-children-switch-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/layer-due-to-layer-children-switch-expected.txt
index 0d1c7a39..d234acc 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/layer-due-to-layer-children-switch-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/layer-due-to-layer-children-switch-expected.txt
@@ -3,7 +3,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -15,7 +15,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -66,7 +66,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/limit-layer-bounds-opacity-transition-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/limit-layer-bounds-opacity-transition-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/limit-layer-bounds-opacity-transition-expected.txt
index f2763342..f684c76 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/limit-layer-bounds-opacity-transition-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/limit-layer-bounds-opacity-transition-expected.txt
@@ -3,7 +3,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -11,14 +11,15 @@
     {
       "name": "LayoutNGBlockFlow DIV class='compositing'",
       "bounds": [2, 2],
+      "contentsOpaqueForText": true,
       "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (relative positioned) DIV class='test')",
-      "position": [-15000, -14],
-      "bounds": [15150, 151],
-      "transform": 1
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='test'",
+      "bounds": [162, 149],
+      "contentsOpaqueForText": true,
+      "backgroundColor": "#FFFFFF"
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/limit-layer-bounds-overflow-root-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/limit-layer-bounds-overflow-root-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/limit-layer-bounds-overflow-root-expected.txt
index 80b5395..4cf7a14 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/limit-layer-bounds-overflow-root-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/limit-layer-bounds-overflow-root-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,14 +9,19 @@
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='compositing'",
       "bounds": [150, 150],
+      "contentsOpaqueForText": true,
       "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV class='indicator')",
-      "position": [-32, -32],
-      "bounds": [324, 213],
-      "transform": 1
+      "name": "LayoutNGBlockFlow (positioned) DIV class='indicator'",
+      "bounds": [213, 213],
+      "contentsOpaqueForText": true
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) PRE id='layers'",
+      "position": [0, 20],
+      "bounds": [324, 22]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/limit-layer-bounds-positioned-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/limit-layer-bounds-positioned-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/limit-layer-bounds-positioned-expected.txt
index 6324aa4d..fe8ae32 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/limit-layer-bounds-positioned-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/limit-layer-bounds-positioned-expected.txt
@@ -2,7 +2,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -10,14 +10,15 @@
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='compositing'",
       "bounds": [150, 150],
+      "contentsOpaqueForText": true,
       "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV class='indicator')",
-      "position": [-15001, -32],
-      "bounds": [15182, 213],
-      "transform": 1
+      "name": "LayoutNGBlockFlow (positioned) DIV class='indicator'",
+      "position": [0, 12],
+      "bounds": [225, 213],
+      "contentsOpaqueForText": true
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/limit-layer-bounds-positioned-transition-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/limit-layer-bounds-positioned-transition-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/limit-layer-bounds-positioned-transition-expected.txt
index da5ef61..b20c11e 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/limit-layer-bounds-positioned-transition-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/limit-layer-bounds-positioned-transition-expected.txt
@@ -2,7 +2,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -10,15 +10,16 @@
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='compositing'",
       "bounds": [150, 150],
+      "contentsOpaqueForText": true,
       "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV class='indicator')",
-      "position": [-1201, -32],
-      "bounds": [1801, 213],
-      "backgroundColor": "#008000",
-      "transform": 1
+      "name": "LayoutNGBlockFlow (positioned) DIV class='indicator'",
+      "position": [0, 12],
+      "bounds": [644, 213],
+      "contentsOpaqueForText": true,
+      "backgroundColor": "#008000"
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/limit-layer-bounds-transformed-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/limit-layer-bounds-transformed-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/limit-layer-bounds-transformed-expected.txt
index af4816e..0f243b4 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/limit-layer-bounds-transformed-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/limit-layer-bounds-transformed-expected.txt
@@ -2,7 +2,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -10,15 +10,16 @@
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='compositing'",
       "bounds": [150, 150],
+      "contentsOpaqueForText": true,
       "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV class='indicator')",
-      "position": [-1501, -32],
-      "bounds": [1832, 213],
-      "backgroundColor": "#008000",
-      "transform": 1
+      "name": "LayoutNGBlockFlow (positioned) DIV class='indicator'",
+      "position": [0, 12],
+      "bounds": [525, 213],
+      "contentsOpaqueForText": true,
+      "backgroundColor": "#008000"
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/preserve-3d-switching-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/preserve-3d-switching-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/preserve-3d-switching-expected.txt
index fe1780f..e936ed31 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/preserve-3d-switching-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/preserve-3d-switching-expected.txt
@@ -4,29 +4,30 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='container'",
-      "position": [162, 108],
-      "bounds": [456, 456]
+      "bounds": [456, 456],
+      "contentsOpaqueForText": true,
+      "transform": 1
     },
     {
       "name": "LayoutNGBlockFlow DIV id='parent'",
       "bounds": [420, 420],
       "contentsOpaque": true,
       "backgroundColor": "#FFFF00",
-      "transform": 3
+      "transform": 4
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV",
       "bounds": [300, 300],
       "contentsOpaque": true,
       "backgroundColor": "#008000",
-      "transform": 5
+      "transform": 6
     }
   ],
   "transforms": [
@@ -35,10 +36,9 @@
       "transform": [
         [1, 0, 0, 0],
         [0, 1, 0, 0],
-        [0, 0, 1, -0.00133333333333333],
-        [0, 0, 0, 1]
-      ],
-      "origin": [390, 336]
+        [0, 0, 1, 0],
+        [162, 108, 0, 1]
+      ]
     },
     {
       "id": 2,
@@ -46,15 +46,26 @@
       "transform": [
         [1, 0, 0, 0],
         [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [180, 126, 0, 1]
+        [0, 0, 1, -0.00133333333333333],
+        [0, 0, 0, 1]
       ],
-      "flattenInheritedTransform": false
+      "origin": [228, 228]
     },
     {
       "id": 3,
       "parent": 2,
       "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [18, 18, 0, 1]
+      ],
+      "flattenInheritedTransform": false
+    },
+    {
+      "id": 4,
+      "parent": 3,
+      "transform": [
         [0.766044443118978, -0.556670399226419, -0.32139380484327, 0],
         [0, 0.5, -0.866025403784439, 0],
         [0.642787609686539, 0.663413948168938, 0.383022221559489, 0],
@@ -65,8 +76,8 @@
       "renderingContext": 1
     },
     {
-      "id": 4,
-      "parent": 3,
+      "id": 5,
+      "parent": 4,
       "transform": [
         [1, 0, 0, 0],
         [0, 1, 0, 0],
@@ -77,8 +88,8 @@
       "renderingContext": 1
     },
     {
-      "id": 5,
-      "parent": 4,
+      "id": 6,
+      "parent": 5,
       "transform": [
         [0.766044443118978, 0, 0.642787609686539, 0],
         [0, 1, 0, 0],

third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/transformed-abs-position-inside-composited-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/transformed-abs-position-inside-composited-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/transformed-abs-position-inside-composited-expected.png
index 8a14aacd..82d22a4 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/transformed-abs-position-inside-composited-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/transformed-abs-position-inside-composited-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/become-composited-nested-iframes-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/become-composited-nested-iframes-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/become-composited-nested-iframes-expected.txt
index 9fd6ea8..836a4c7 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/become-composited-nested-iframes-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/become-composited-nested-iframes-expected.txt
@@ -1,24 +1,12 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 2250],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "LayoutView #document",
-      "bounds": [420, 300],
-      "transform": 1
-    },
-    {
-      "name": "LayoutView #document",
-      "bounds": [375, 255],
-      "contentsOpaqueForText": true,
-      "backgroundColor": "#C0C0C0",
-      "transform": 2
-    },
-    {
       "name": "LayoutNGBlockFlow DIV id='iframe-content' class='box'",
       "bounds": [315, 315],
       "contentsOpaque": true,
@@ -26,18 +14,6 @@
       "transform": 3
     },
     {
-      "name": "LayoutView #document",
-      "bounds": [420, 300],
-      "transform": 4
-    },
-    {
-      "name": "LayoutView #document",
-      "bounds": [375, 255],
-      "contentsOpaqueForText": true,
-      "backgroundColor": "#C0C0C0",
-      "transform": 5
-    },
-    {
       "name": "LayoutNGBlockFlow DIV id='iframe-content' class='box'",
       "bounds": [315, 315],
       "contentsOpaque": true,
@@ -51,10 +27,9 @@
       "backgroundColor": "#0000FF"
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/become-overlapped-iframe-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/become-overlapped-iframe-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/become-overlapped-iframe-expected.txt
index 44f8aff..3840f3f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/become-overlapped-iframe-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/become-overlapped-iframe-expected.txt
@@ -1,19 +1,25 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [458, 345],
-      "contentsOpaqueForText": true,
+      "contentsOpaque": true,
       "backgroundColor": "#C0C0C0",
       "transform": 1
     },
     {
+      "name": "VerticalScrollbar",
+      "position": [458, 0],
+      "bounds": [22, 255],
+      "transform": 1
+    },
+    {
       "name": "LayoutNGBlockFlow DIV id='iframe-content' class='box'",
       "bounds": [315, 315],
       "contentsOpaque": true,
@@ -21,15 +27,10 @@
       "transform": 2
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "position": [458, 0],
-      "bounds": [22, 255],
-      "transform": 1
-    },
-    {
       "name": "LayoutNGBlockFlow (positioned) DIV id='overlay'",
       "position": [8, 8],
       "bounds": [225, 225],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#00000099"
     }
   ],

third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/composited-parent-iframe-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/composited-parent-iframe-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/composited-parent-iframe-expected.txt
index 085a3a8..ecc4b2a 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/composited-parent-iframe-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/composited-parent-iframe-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -10,27 +10,28 @@
       "name": "LayoutIFrame IFRAME",
       "position": [-45, -45],
       "bounds": [585, 360],
+      "contentsOpaqueForText": true,
       "transform": 1
     },
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [428, 345],
-      "contentsOpaqueForText": true,
+      "contentsOpaque": true,
       "backgroundColor": "#C0C0C0",
       "transform": 2
     },
     {
+      "name": "VerticalScrollbar",
+      "position": [428, 0],
+      "bounds": [22, 225],
+      "transform": 2
+    },
+    {
       "name": "LayoutNGBlockFlow DIV id='iframe-content' class='box'",
       "bounds": [315, 315],
       "contentsOpaque": true,
       "backgroundColor": "#0000FF",
       "transform": 3
-    },
-    {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "position": [428, 0],
-      "bounds": [22, 225],
-      "transform": 2
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/connect-compositing-iframe-delayed-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/connect-compositing-iframe-delayed-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/connect-compositing-iframe-delayed-expected.txt
index 8a428a6..cf03722 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/connect-compositing-iframe-delayed-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/connect-compositing-iframe-delayed-expected.txt
@@ -3,19 +3,25 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [428, 345],
-      "contentsOpaqueForText": true,
+      "contentsOpaque": true,
       "backgroundColor": "#C0C0C0",
       "transform": 1
     },
     {
+      "name": "VerticalScrollbar",
+      "position": [428, 0],
+      "bounds": [22, 225],
+      "transform": 1
+    },
+    {
       "name": "LayoutNGBlockFlow DIV id='iframe-content' class='box'",
       "bounds": [315, 315],
       "contentsOpaque": true,
@@ -23,12 +29,6 @@
       "transform": 2
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "position": [428, 0],
-      "bounds": [22, 225],
-      "transform": 1
-    },
-    {
       "name": "LayoutNGBlockFlow DIV id='box' class='composited'",
       "bounds": [150, 150],
       "contentsOpaque": true,

third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/connect-compositing-iframe-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/connect-compositing-iframe-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/connect-compositing-iframe-expected.txt
index b80a1b61..03d33c4 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/connect-compositing-iframe-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/connect-compositing-iframe-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -10,16 +10,23 @@
       "name": "LayoutIFrame IFRAME id='parent-iframe'",
       "position": [-45, -45],
       "bounds": [585, 360],
+      "contentsOpaqueForText": true,
       "transform": 1
     },
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [428, 345],
-      "contentsOpaqueForText": true,
+      "contentsOpaque": true,
       "backgroundColor": "#C0C0C0",
       "transform": 2
     },
     {
+      "name": "VerticalScrollbar",
+      "position": [428, 0],
+      "bounds": [22, 225],
+      "transform": 2
+    },
+    {
       "name": "LayoutNGBlockFlow DIV id='test' class='composited box'",
       "bounds": [315, 315],
       "contentsOpaque": true,
@@ -27,15 +34,10 @@
       "transform": 3
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "position": [428, 0],
-      "bounds": [22, 225],
-      "transform": 2
-    },
-    {
       "name": "LayoutNGBlockFlow (positioned) DIV class='overlay'",
       "position": [8, 8],
       "bounds": [75, 75],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#00000033"
     }
   ],

third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/connect-compositing-iframe2-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/connect-compositing-iframe2-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/connect-compositing-iframe2-expected.txt
index 1655d869c..2deced2 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/connect-compositing-iframe2-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/connect-compositing-iframe2-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -10,16 +10,23 @@
       "name": "LayoutIFrame IFRAME id='iframe'",
       "position": [-45, -45],
       "bounds": [585, 360],
+      "contentsOpaqueForText": true,
       "transform": 1
     },
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [428, 345],
-      "contentsOpaqueForText": true,
+      "contentsOpaque": true,
       "backgroundColor": "#C0C0C0",
       "transform": 2
     },
     {
+      "name": "VerticalScrollbar",
+      "position": [428, 0],
+      "bounds": [22, 225],
+      "transform": 2
+    },
+    {
       "name": "LayoutNGBlockFlow DIV id='iframe-content' class='box'",
       "bounds": [315, 315],
       "contentsOpaque": true,
@@ -27,15 +34,10 @@
       "transform": 3
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "position": [428, 0],
-      "bounds": [22, 225],
-      "transform": 2
-    },
-    {
       "name": "LayoutNGBlockFlow (positioned) DIV class='overlay'",
       "position": [8, 8],
       "bounds": [75, 75],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#00000033"
     }
   ],

third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/connect-compositing-iframe3-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/connect-compositing-iframe3-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/connect-compositing-iframe3-expected.txt
index 1804838b..211e89b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/connect-compositing-iframe3-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/connect-compositing-iframe3-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -10,27 +10,28 @@
       "name": "LayoutIFrame IFRAME id='iframe' class='composited'",
       "position": [-45, -45],
       "bounds": [585, 360],
+      "contentsOpaqueForText": true,
       "transform": 1
     },
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [428, 345],
-      "contentsOpaqueForText": true,
+      "contentsOpaque": true,
       "backgroundColor": "#C0C0C0",
       "transform": 2
     },
     {
+      "name": "VerticalScrollbar",
+      "position": [428, 0],
+      "bounds": [22, 225],
+      "transform": 2
+    },
+    {
       "name": "LayoutNGBlockFlow DIV id='iframe-content' class='box'",
       "bounds": [315, 315],
       "contentsOpaque": true,
       "backgroundColor": "#0000FF",
       "transform": 3
-    },
-    {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "position": [428, 0],
-      "bounds": [22, 225],
-      "transform": 2
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/enter-compositing-iframe-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/enter-compositing-iframe-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/enter-compositing-iframe-expected.txt
index 0cd848b..e95a4e5 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/enter-compositing-iframe-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/enter-compositing-iframe-expected.txt
@@ -1,19 +1,25 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [428, 345],
-      "contentsOpaqueForText": true,
+      "contentsOpaque": true,
       "backgroundColor": "#C0C0C0",
       "transform": 1
     },
     {
+      "name": "VerticalScrollbar",
+      "position": [428, 0],
+      "bounds": [22, 225],
+      "transform": 1
+    },
+    {
       "name": "LayoutNGBlockFlow DIV id='test' class='composited box'",
       "bounds": [315, 315],
       "contentsOpaque": true,
@@ -21,15 +27,10 @@
       "transform": 2
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "position": [428, 0],
-      "bounds": [22, 225],
-      "transform": 1
-    },
-    {
       "name": "LayoutNGBlockFlow (positioned) DIV class='overlay'",
       "position": [8, 8],
       "bounds": [75, 75],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#00000033"
     }
   ],

third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/iframe-resize-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/iframe-resize-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/iframe-resize-expected.txt
index 5a310019..b1ba698 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/iframe-resize-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/iframe-resize-expected.txt
@@ -1,19 +1,25 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [578, 345],
-      "contentsOpaqueForText": true,
+      "contentsOpaque": true,
       "backgroundColor": "#C0C0C0",
       "transform": 1
     },
     {
+      "name": "VerticalScrollbar",
+      "position": [578, 0],
+      "bounds": [22, 180],
+      "transform": 1
+    },
+    {
       "name": "LayoutNGBlockFlow DIV id='iframe-content' class='box'",
       "bounds": [315, 315],
       "contentsOpaque": true,
@@ -21,15 +27,10 @@
       "transform": 2
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "position": [578, 0],
-      "bounds": [22, 180],
-      "transform": 1
-    },
-    {
       "name": "LayoutNGBlockFlow (positioned) DIV class='overlay'",
       "position": [8, 8],
       "bounds": [75, 75],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#00000033"
     }
   ],

third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/iframe-size-from-zero-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/iframe-size-from-zero-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/iframe-size-from-zero-expected.txt
index e7d650d..caa7682 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/iframe-size-from-zero-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/iframe-size-from-zero-expected.txt
@@ -1,19 +1,25 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [428, 345],
-      "contentsOpaqueForText": true,
+      "contentsOpaque": true,
       "backgroundColor": "#C0C0C0",
       "transform": 1
     },
     {
+      "name": "VerticalScrollbar",
+      "position": [428, 0],
+      "bounds": [22, 225],
+      "transform": 1
+    },
+    {
       "name": "LayoutNGBlockFlow DIV id='iframe-content' class='box'",
       "bounds": [315, 315],
       "contentsOpaque": true,
@@ -21,15 +27,10 @@
       "transform": 2
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "position": [428, 0],
-      "bounds": [22, 225],
-      "transform": 1
-    },
-    {
       "name": "LayoutNGBlockFlow (positioned) DIV class='overlay'",
       "position": [8, 8],
       "bounds": [75, 75],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#00000033"
     }
   ],

third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/invisible-nested-iframe-hide-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/invisible-nested-iframe-hide-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/invisible-nested-iframe-hide-expected.txt
index 836ed60..0b584ec 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/invisible-nested-iframe-hide-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/invisible-nested-iframe-hide-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/invisible-nested-iframe-show-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/invisible-nested-iframe-show-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/invisible-nested-iframe-show-expected.txt
index ec23b22..5e32822d4 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/invisible-nested-iframe-show-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/invisible-nested-iframe-show-expected.txt
@@ -1,22 +1,23 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "Scrolling Contents Layer",
-      "bounds": [428, 288],
+      "name": "VerticalScrollbar",
+      "position": [428, 0],
+      "bounds": [22, 225],
       "transform": 1
     },
     {
-      "name": "LayoutView #document",
-      "bounds": [375, 255],
+      "name": "LayoutNGBlockFlow HTML",
+      "bounds": [428, 288],
       "contentsOpaqueForText": true,
       "backgroundColor": "#C0C0C0",
-      "transform": 2
+      "transform": 1
     },
     {
       "name": "LayoutNGBlockFlow DIV id='iframe-content' class='box'",
@@ -26,12 +27,6 @@
       "transform": 3
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "position": [428, 0],
-      "bounds": [22, 225],
-      "transform": 1
-    },
-    {
       "name": "LayoutNGBlockFlow DIV class='box'",
       "bounds": [315, 315],
       "contentsOpaque": true,

third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/overlapped-iframe-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/overlapped-iframe-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/overlapped-iframe-expected.txt
index e7d650d..caa7682 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/overlapped-iframe-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/overlapped-iframe-expected.txt
@@ -1,19 +1,25 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [428, 345],
-      "contentsOpaqueForText": true,
+      "contentsOpaque": true,
       "backgroundColor": "#C0C0C0",
       "transform": 1
     },
     {
+      "name": "VerticalScrollbar",
+      "position": [428, 0],
+      "bounds": [22, 225],
+      "transform": 1
+    },
+    {
       "name": "LayoutNGBlockFlow DIV id='iframe-content' class='box'",
       "bounds": [315, 315],
       "contentsOpaque": true,
@@ -21,15 +27,10 @@
       "transform": 2
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "position": [428, 0],
-      "bounds": [22, 225],
-      "transform": 1
-    },
-    {
       "name": "LayoutNGBlockFlow (positioned) DIV class='overlay'",
       "position": [8, 8],
       "bounds": [75, 75],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#00000033"
     }
   ],

third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/overlapped-iframe-iframe-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/overlapped-iframe-iframe-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/overlapped-iframe-iframe-expected.txt
index c9c107c..c2c5777 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/overlapped-iframe-iframe-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/overlapped-iframe-iframe-expected.txt
@@ -1,19 +1,12 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "LayoutView #document",
-      "bounds": [450, 450],
-      "contentsOpaqueForText": true,
-      "backgroundColor": "#C0C0C0",
-      "transform": 1
-    },
-    {
       "name": "LayoutNGBlockFlow DIV id='iframe-content' class='box'",
       "bounds": [315, 315],
       "contentsOpaque": true,
@@ -21,19 +14,14 @@
       "transform": 2
     },
     {
-      "name": "LayoutIFrame (positioned) IFRAME id='overlap'",
-      "position": [375, 0],
-      "bounds": [456, 456]
-    },
-    {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [428, 1527],
-      "contentsOpaqueForText": true,
+      "contentsOpaque": true,
       "backgroundColor": "#C0C0C0",
       "transform": 3
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [428, 0],
       "bounds": [22, 450],
       "transform": 3

third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/overlapped-nested-iframes-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/overlapped-nested-iframes-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/overlapped-nested-iframes-expected.txt
index 0232b2c..f9e3809 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/overlapped-nested-iframes-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/overlapped-nested-iframes-expected.txt
@@ -1,25 +1,13 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 2475],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "transform": 1
     },
     {
-      "name": "LayoutView #document",
-      "bounds": [420, 300],
-      "transform": 2
-    },
-    {
-      "name": "LayoutView #document",
-      "bounds": [375, 255],
-      "contentsOpaqueForText": true,
-      "backgroundColor": "#C0C0C0",
-      "transform": 3
-    },
-    {
       "name": "LayoutNGBlockFlow DIV id='iframe-content' class='box'",
       "bounds": [315, 315],
       "contentsOpaque": true,
@@ -27,18 +15,6 @@
       "transform": 4
     },
     {
-      "name": "LayoutView #document",
-      "bounds": [420, 300],
-      "transform": 5
-    },
-    {
-      "name": "LayoutView #document",
-      "bounds": [375, 255],
-      "contentsOpaqueForText": true,
-      "backgroundColor": "#C0C0C0",
-      "transform": 6
-    },
-    {
       "name": "LayoutNGBlockFlow DIV id='iframe-content' class='box'",
       "bounds": [315, 315],
       "contentsOpaque": true,
@@ -48,13 +24,13 @@
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='banner'",
       "bounds": [1178, 180],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#00000080"
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/resizer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/resizer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/resizer-expected.txt
index 15951bb9..3eba3a4 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/resizer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/resizer-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,22 +9,23 @@
     {
       "name": "LayoutIFrame IFRAME class='container'",
       "bounds": [456, 231],
-      "transform": 1
-    },
-    {
-      "name": "Scroll Corner Layer",
-      "position": [431, 206],
-      "bounds": [22, 22],
-      "transform": 1
-    },
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [428, 345],
       "contentsOpaqueForText": true,
+      "transform": 1
+    },
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [428, 345],
+      "contentsOpaque": true,
       "backgroundColor": "#C0C0C0",
       "transform": 2
     },
     {
+      "name": "VerticalScrollbar",
+      "position": [428, 0],
+      "bounds": [22, 225],
+      "transform": 2
+    },
+    {
       "name": "LayoutNGBlockFlow DIV id='iframe-content' class='box'",
       "bounds": [315, 315],
       "contentsOpaque": true,
@@ -32,10 +33,11 @@
       "transform": 3
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "position": [428, 0],
-      "bounds": [22, 225],
-      "transform": 2
+      "name": "Scroll corner of LayoutIFrame IFRAME class='container'",
+      "position": [431, 206],
+      "bounds": [22, 22],
+      "contentsOpaqueForText": true,
+      "transform": 1
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/scrolling-iframe-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/scrolling-iframe-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/scrolling-iframe-expected.txt
index 15fa5b8..a288200 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/scrolling-iframe-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/scrolling-iframe-expected.txt
@@ -1,19 +1,38 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [762, 912],
-      "contentsOpaqueForText": true,
+      "contentsOpaque": true,
       "backgroundColor": "#C0C0C0",
       "transform": 2
     },
     {
+      "name": "HorizontalScrollbar",
+      "position": [0, 203],
+      "bounds": [428, 22],
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [428, 0],
+      "bounds": [22, 203],
+      "transform": 1
+    },
+    {
+      "name": "Scroll corner of LayoutView #document",
+      "position": [428, 203],
+      "bounds": [22, 22],
+      "contentsOpaque": true,
+      "transform": 1
+    },
+    {
       "name": "LayoutNGBlockFlow DIV id='iframe-content' class='box'",
       "bounds": [300, 300],
       "contentsOpaque": true,
@@ -21,27 +40,10 @@
       "transform": 3
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
-      "position": [0, 203],
-      "bounds": [428, 22],
-      "transform": 1
-    },
-    {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "position": [428, 0],
-      "bounds": [22, 203],
-      "transform": 1
-    },
-    {
-      "name": "Scroll Corner Layer",
-      "position": [428, 203],
-      "bounds": [22, 22],
-      "transform": 1
-    },
-    {
       "name": "LayoutNGBlockFlow (positioned) DIV class='overlay'",
       "position": [8, 8],
       "bounds": [75, 75],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#00000033"
     }
   ],

third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/visibility-hidden-transformed-content-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/visibility-hidden-transformed-content-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/visibility-hidden-transformed-content-expected.txt
index 7f87abd0..36ece76f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/visibility-hidden-transformed-content-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/visibility-hidden-transformed-content-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/compositing/images/clip-on-directly-composited-image-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/images/clip-on-directly-composited-image-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/images/clip-on-directly-composited-image-expected.txt
index 1b631230..2c0b574 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/images/clip-on-directly-composited-image-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/images/clip-on-directly-composited-image-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -10,6 +10,7 @@
       "name": "LayoutImage (positioned) IMG class='composited'",
       "position": [15, 15],
       "bounds": [210, 210],
+      "contentsOpaqueForText": true,
       "transform": 1
     }
   ],

third_party/blink/web_tests/flag-specific/highdpi/compositing/images/direct-image-dynamic-border-draws-content-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/images/direct-image-dynamic-border-draws-content-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/images/direct-image-dynamic-border-draws-content-expected.txt
index 74e7b48..b70375c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/images/direct-image-dynamic-border-draws-content-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/images/direct-image-dynamic-border-draws-content-expected.txt
@@ -3,7 +3,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -11,6 +11,7 @@
     {
       "name": "LayoutImage IMG class='composited'",
       "bounds": [384, 384],
+      "contentsOpaqueForText": true,
       "transform": 1
     }
   ],
@@ -32,7 +33,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -40,6 +41,7 @@
     {
       "name": "LayoutImage IMG class='composited border'",
       "bounds": [390, 390],
+      "contentsOpaqueForText": true,
       "transform": 1
     }
   ],

third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/animation-overlap-with-children-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/animation-overlap-with-children-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/animation-overlap-with-children-expected.txt
index 36afd23..835def4 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/animation-overlap-with-children-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/animation-overlap-with-children-expected.txt
@@ -4,7 +4,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -22,11 +22,11 @@
       "transform": 3
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV class='test1 box')",
-      "position": [7, 22],
-      "bounds": [151, 151],
+      "name": "LayoutNGBlockFlow (positioned) DIV class='test1 box'",
+      "position": [16, 32],
+      "bounds": [151, 150],
       "backgroundColor": "#FFA500",
-      "transform": 3
+      "transform": 2
     },
     {
       "name": "LayoutNGBlockFlow (relative positioned) DIV class='box'",

third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-and-transform-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-and-transform-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-and-transform-expected.txt
index a3fce87..8bce83c9 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-and-transform-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-and-transform-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 7532],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -21,10 +21,9 @@
       "backgroundColor": "#008000"
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-change-out-of-view-in-view-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-change-out-of-view-in-view-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-change-out-of-view-in-view-expected.txt
index 2908ea79..b7736c2 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-change-out-of-view-in-view-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-change-out-of-view-in-view-expected.txt
@@ -2,49 +2,15 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 6024],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "LayoutNGBlockFlow (positioned) DIV id='fixed1'",
-      "bounds": [15, 15],
-      "contentsOpaque": true,
-      "backgroundColor": "#C0C0C0",
-      "transform": 1
-    },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV id='fixed2'",
-      "contentsOpaque": true,
-      "drawsContent": false,
-      "transform": 2
-    },
-    {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
-    }
-  ],
-  "transforms": [
-    {
-      "id": 1,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [150, -150, 0, 1]
-      ]
-    },
-    {
-      "id": 2,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [150, 150, 0, 1]
-      ]
+      "bounds": [22, 900]
     }
   ]
 }
@@ -53,7 +19,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 6024],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -73,10 +39,9 @@
       "transform": 2
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [
@@ -105,49 +70,15 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 6024],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "LayoutNGBlockFlow (positioned) DIV id='fixed1'",
-      "bounds": [15, 15],
-      "contentsOpaque": true,
-      "backgroundColor": "#C0C0C0",
-      "transform": 1
-    },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV id='fixed2'",
-      "contentsOpaque": true,
-      "drawsContent": false,
-      "transform": 2
-    },
-    {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
-    }
-  ],
-  "transforms": [
-    {
-      "id": 1,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [150, -150, 0, 1]
-      ]
-    },
-    {
-      "id": 2,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [150, 150, 0, 1]
-      ]
+      "bounds": [22, 900]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-in-fixed-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-in-fixed-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-in-fixed-overflow-expected.txt
index 24644f16..e754067 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-in-fixed-overflow-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-in-fixed-overflow-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,17 +9,27 @@
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='overflow fixed'",
       "bounds": [1200, 900],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "LayoutNGBlockFlow (positioned) DIV class='overflow fixed'",
+      "bounds": [1178, 900],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
       "bounds": [22, 900],
       "transform": 1
     },
     {
-      "name": "Scrolling Contents Layer",
-      "bounds": [1178, 1500],
+      "name": "LayoutNGBlockFlow (positioned) DIV class='overflow fixed'",
+      "bounds": [150, 1500],
+      "contentsOpaque": true,
+      "backgroundColor": "#0000FF",
       "transform": 1
     },
     {

third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-no-content-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-no-content-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-no-content-expected.txt
index 3d3f111..f00d5c0 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-no-content-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-no-content-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 1532],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,6 +9,7 @@
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='fixed'",
       "bounds": [75, 75],
+      "contentsOpaqueForText": true,
       "drawsContent": false,
       "transform": 1
     },
@@ -20,10 +21,9 @@
       "backgroundColor": "#808080"
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-nonscrollable-body-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-nonscrollable-body-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-nonscrollable-body-expected.txt
index d22bf79..c47e2a08 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-nonscrollable-body-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-nonscrollable-body-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 6032],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-nonscrollable-body-mismatch-containers-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-nonscrollable-body-mismatch-containers-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-nonscrollable-body-mismatch-containers-expected.txt
index 204767d..4d87dd9b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-nonscrollable-body-mismatch-containers-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-nonscrollable-body-mismatch-containers-expected.txt
@@ -3,38 +3,36 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow DIV class='scrollable bigBox'",
-      "bounds": [453, 453],
+      "position": [2, 2],
+      "bounds": [428, 428],
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
-      "position": [1, 430],
-      "bounds": [428, 22],
+      "name": "HorizontalScrollbar",
+      "position": [1, 429],
+      "bounds": [450, 23],
+      "contentsOpaqueForText": true,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [430, 1],
       "bounds": [22, 428],
       "transform": 1
     },
     {
-      "name": "Scroll Corner Layer",
-      "position": [429, 429],
-      "bounds": [22, 22],
-      "transform": 1
-    },
-    {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow DIV class='scrollable bigBox'",
       "position": [2, 2],
       "bounds": [428, 1200],
+      "contentsOpaque": true,
       "transform": 1
     },
     {

third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-nonscrollable-body-overlap-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-nonscrollable-body-overlap-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-nonscrollable-body-overlap-expected.txt
index e1e2e99..26370eb 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-nonscrollable-body-overlap-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-nonscrollable-body-overlap-expected.txt
@@ -3,7 +3,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 6036],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-nonscrollable-iframes-in-scrollable-page-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-nonscrollable-iframes-in-scrollable-page-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-nonscrollable-iframes-in-scrollable-page-expected.txt
index e975c97a..832b231f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-nonscrollable-iframes-in-scrollable-page-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-nonscrollable-iframes-in-scrollable-page-expected.txt
@@ -2,7 +2,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 6024],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -15,11 +15,6 @@
       "transform": 1
     },
     {
-      "name": "LayoutView #document",
-      "bounds": [225, 225],
-      "transform": 2
-    },
-    {
       "name": "LayoutNGBlockFlow (positioned) DIV class='fixed lime box'",
       "bounds": [150, 150],
       "contentsOpaque": true,
@@ -29,14 +24,10 @@
     {
       "name": "LayoutIFrame (positioned) IFRAME id='iframe2' class='composited'",
       "bounds": [231, 231],
+      "contentsOpaqueForText": true,
       "transform": 4
     },
     {
-      "name": "LayoutView #document",
-      "bounds": [225, 225],
-      "transform": 5
-    },
-    {
       "name": "LayoutNGBlockFlow (positioned) DIV class='fixed lime box'",
       "bounds": [150, 150],
       "contentsOpaque": true,
@@ -46,12 +37,8 @@
     {
       "name": "LayoutIFrame (positioned) IFRAME id='iframe3'",
       "position": [15, 570],
-      "bounds": [231, 231]
-    },
-    {
-      "name": "LayoutView #document",
-      "bounds": [225, 225],
-      "transform": 7
+      "bounds": [231, 231],
+      "contentsOpaqueForText": true
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='fixed lime box'",
@@ -61,10 +48,9 @@
       "transform": 8
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-out-of-view-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-out-of-view-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-out-of-view-expected.txt
index 6575c94..ce0b5ed9 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-out-of-view-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-out-of-view-expected.txt
@@ -1,29 +1,10 @@
 {
   "layers": [
     {
-      "name": "LayoutNGBlockFlow HTML",
-      "bounds": [1178, 1532]
-    },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='fixed'",
-      "bounds": [15, 15],
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 1532],
       "contentsOpaque": true,
-      "backgroundColor": "#C0C0C0",
-      "transform": 1
-    },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='fixed'",
-      "bounds": [15, 15],
-      "contentsOpaque": true,
-      "backgroundColor": "#C0C0C0",
-      "transform": 2
-    },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='fixed'",
-      "bounds": [15, 15],
-      "contentsOpaque": true,
-      "backgroundColor": "#C0C0C0",
-      "transform": 3
+      "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='fixed'",
@@ -32,43 +13,16 @@
       "backgroundColor": "#C0C0C0"
     },
     {
-      "name": "LayoutNGBlockFlow HTML (foreground) Layer",
-      "bounds": [1178, 1532]
+      "name": "LayoutNGBlockFlow HTML",
+      "position": [12, 20],
+      "bounds": [1154, 1500],
+      "contentsOpaqueForText": true,
+      "drawsContent": false
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
-    }
-  ],
-  "transforms": [
-    {
-      "id": 1,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [12, 1520, 0, 1]
-      ]
-    },
-    {
-      "id": 2,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [12, -150, 0, 1]
-      ]
-    },
-    {
-      "id": 3,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [1500, 0, 0, 1]
-      ]
+      "bounds": [22, 900]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-out-of-view-positioning-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-out-of-view-positioning-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-out-of-view-positioning-expected.txt
index 914d19a2..1e2a130 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-out-of-view-positioning-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-out-of-view-positioning-expected.txt
@@ -8,7 +8,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [3012, 3024],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -22,21 +22,20 @@
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 878],
-      "bounds": [1178, 22],
-      "contentsOpaque": true
+      "bounds": [1178, 22]
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 878],
-      "contentsOpaque": true
+      "bounds": [22, 878]
     },
     {
-      "name": "Scroll Corner Layer",
+      "name": "Scroll corner of LayoutView #document",
       "position": [1178, 878],
-      "bounds": [22, 22]
+      "bounds": [22, 22],
+      "contentsOpaque": true
     }
   ],
   "transforms": [
@@ -56,7 +55,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [3012, 3024],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -71,21 +70,20 @@
       "transform": 2
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 878],
-      "bounds": [1178, 22],
-      "contentsOpaque": true
+      "bounds": [1178, 22]
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 878],
-      "contentsOpaque": true
+      "bounds": [22, 878]
     },
     {
-      "name": "Scroll Corner Layer",
+      "name": "Scroll corner of LayoutView #document",
       "position": [1178, 878],
-      "bounds": [22, 22]
+      "bounds": [22, 22],
+      "contentsOpaque": true
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-out-of-view-scaled-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-out-of-view-scaled-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-out-of-view-scaled-expected.txt
index e06375ed0..1f30515b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-out-of-view-scaled-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-out-of-view-scaled-expected.txt
@@ -2,7 +2,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [6012, 6024],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -34,24 +34,7 @@
       "bounds": [15, 15],
       "contentsOpaque": true,
       "backgroundColor": "#C0C0C0",
-      "transform": 5
-    },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='fixed'",
-      "bounds": [15, 15],
-      "contentsOpaque": true,
-      "backgroundColor": "#C0C0C0",
       "transform": 1
-    },
-    {
-      "name": "Horizontal Scrollbar Layer",
-      "position": [0, 900],
-      "bounds": [1200, 0]
-    },
-    {
-      "name": "Vertical Scrollbar Layer",
-      "position": [1200, 0],
-      "bounds": [0, 900]
     }
   ],
   "transforms": [
@@ -73,7 +56,7 @@
         [1, 0, 0, 0],
         [0, 1, 0, 0],
         [0, 0, 1, 0],
-        [12, -150, 0, 1]
+        [12, 1512, 0, 1]
       ]
     },
     {
@@ -83,21 +66,11 @@
         [1, 0, 0, 0],
         [0, 1, 0, 0],
         [0, 0, 1, 0],
-        [12, 1512, 0, 1]
-      ]
-    },
-    {
-      "id": 4,
-      "parent": 1,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
         [1500, 0, 0, 1]
       ]
     },
     {
-      "id": 5,
+      "id": 4,
       "parent": 1,
       "transform": [
         [1, 0, 0, 0],
@@ -113,7 +86,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [6012, 6024],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -145,24 +118,7 @@
       "bounds": [15, 15],
       "contentsOpaque": true,
       "backgroundColor": "#C0C0C0",
-      "transform": 5
-    },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='fixed'",
-      "bounds": [15, 15],
-      "contentsOpaque": true,
-      "backgroundColor": "#C0C0C0",
       "transform": 1
-    },
-    {
-      "name": "Horizontal Scrollbar Layer",
-      "position": [0, 900],
-      "bounds": [1200, 0]
-    },
-    {
-      "name": "Vertical Scrollbar Layer",
-      "position": [1200, 0],
-      "bounds": [0, 900]
     }
   ],
   "transforms": [
@@ -184,7 +140,7 @@
         [1, 0, 0, 0],
         [0, 1, 0, 0],
         [0, 0, 1, 0],
-        [12, -150, 0, 1]
+        [12, 1512, 0, 1]
       ]
     },
     {
@@ -194,21 +150,11 @@
         [1, 0, 0, 0],
         [0, 1, 0, 0],
         [0, 0, 1, 0],
-        [12, 1512, 0, 1]
-      ]
-    },
-    {
-      "id": 4,
-      "parent": 1,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
         [1500, 0, 0, 1]
       ]
     },
     {
-      "id": 5,
+      "id": 4,
       "parent": 1,
       "transform": [
         [1, 0, 0, 0],
@@ -224,7 +170,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [6012, 6024],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -256,24 +202,7 @@
       "bounds": [15, 15],
       "contentsOpaque": true,
       "backgroundColor": "#C0C0C0",
-      "transform": 5
-    },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='fixed'",
-      "bounds": [15, 15],
-      "contentsOpaque": true,
-      "backgroundColor": "#C0C0C0",
       "transform": 1
-    },
-    {
-      "name": "Horizontal Scrollbar Layer",
-      "position": [0, 900],
-      "bounds": [1200, 0]
-    },
-    {
-      "name": "Vertical Scrollbar Layer",
-      "position": [1200, 0],
-      "bounds": [0, 900]
     }
   ],
   "transforms": [
@@ -295,7 +224,7 @@
         [1, 0, 0, 0],
         [0, 1, 0, 0],
         [0, 0, 1, 0],
-        [12, -150, 0, 1]
+        [12, 1512, 0, 1]
       ]
     },
     {
@@ -305,21 +234,11 @@
         [1, 0, 0, 0],
         [0, 1, 0, 0],
         [0, 0, 1, 0],
-        [12, 1512, 0, 1]
-      ]
-    },
-    {
-      "id": 4,
-      "parent": 1,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
         [1500, 0, 0, 1]
       ]
     },
     {
-      "id": 5,
+      "id": 4,
       "parent": 1,
       "transform": [
         [1, 0, 0, 0],

third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-out-of-view-scaled-scroll-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-out-of-view-scaled-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-out-of-view-scaled-scroll-expected.txt
index e8bb8f2..1b10170 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-out-of-view-scaled-scroll-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-out-of-view-scaled-scroll-expected.txt
@@ -2,7 +2,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [6012, 6024],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -34,24 +34,7 @@
       "bounds": [15, 15],
       "contentsOpaque": true,
       "backgroundColor": "#C0C0C0",
-      "transform": 6
-    },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='fixed'",
-      "bounds": [15, 15],
-      "contentsOpaque": true,
-      "backgroundColor": "#C0C0C0",
       "transform": 1
-    },
-    {
-      "name": "Horizontal Scrollbar Layer",
-      "position": [0, 900],
-      "bounds": [1200, 0]
-    },
-    {
-      "name": "Vertical Scrollbar Layer",
-      "position": [1200, 0],
-      "bounds": [0, 900]
     }
   ],
   "transforms": [
@@ -83,7 +66,7 @@
         [1, 0, 0, 0],
         [0, 1, 0, 0],
         [0, 0, 1, 0],
-        [12, -150, 0, 1]
+        [12, 1512, 0, 1]
       ]
     },
     {
@@ -93,21 +76,11 @@
         [1, 0, 0, 0],
         [0, 1, 0, 0],
         [0, 0, 1, 0],
-        [12, 1512, 0, 1]
-      ]
-    },
-    {
-      "id": 5,
-      "parent": 1,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
         [1500, 0, 0, 1]
       ]
     },
     {
-      "id": 6,
+      "id": 5,
       "parent": 1,
       "transform": [
         [1, 0, 0, 0],
@@ -123,7 +96,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [6012, 6024],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -155,24 +128,7 @@
       "bounds": [15, 15],
       "contentsOpaque": true,
       "backgroundColor": "#C0C0C0",
-      "transform": 6
-    },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='fixed'",
-      "bounds": [15, 15],
-      "contentsOpaque": true,
-      "backgroundColor": "#C0C0C0",
       "transform": 1
-    },
-    {
-      "name": "Horizontal Scrollbar Layer",
-      "position": [0, 900],
-      "bounds": [1200, 0]
-    },
-    {
-      "name": "Vertical Scrollbar Layer",
-      "position": [1200, 0],
-      "bounds": [0, 900]
     }
   ],
   "transforms": [
@@ -204,7 +160,7 @@
         [1, 0, 0, 0],
         [0, 1, 0, 0],
         [0, 0, 1, 0],
-        [12, -150, 0, 1]
+        [12, 1512, 0, 1]
       ]
     },
     {
@@ -214,21 +170,11 @@
         [1, 0, 0, 0],
         [0, 1, 0, 0],
         [0, 0, 1, 0],
-        [12, 1512, 0, 1]
-      ]
-    },
-    {
-      "id": 5,
-      "parent": 1,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
         [1500, 0, 0, 1]
       ]
     },
     {
-      "id": 6,
+      "id": 5,
       "parent": 1,
       "transform": [
         [1, 0, 0, 0],
@@ -244,7 +190,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [6012, 6024],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -276,24 +222,7 @@
       "bounds": [15, 15],
       "contentsOpaque": true,
       "backgroundColor": "#C0C0C0",
-      "transform": 6
-    },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='fixed'",
-      "bounds": [15, 15],
-      "contentsOpaque": true,
-      "backgroundColor": "#C0C0C0",
       "transform": 1
-    },
-    {
-      "name": "Horizontal Scrollbar Layer",
-      "position": [0, 900],
-      "bounds": [1200, 0]
-    },
-    {
-      "name": "Vertical Scrollbar Layer",
-      "position": [1200, 0],
-      "bounds": [0, 900]
     }
   ],
   "transforms": [
@@ -325,7 +254,7 @@
         [1, 0, 0, 0],
         [0, 1, 0, 0],
         [0, 0, 1, 0],
-        [12, -150, 0, 1]
+        [12, 1512, 0, 1]
       ]
     },
     {
@@ -335,21 +264,11 @@
         [1, 0, 0, 0],
         [0, 1, 0, 0],
         [0, 0, 1, 0],
-        [12, 1512, 0, 1]
-      ]
-    },
-    {
-      "id": 5,
-      "parent": 1,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
         [1500, 0, 0, 1]
       ]
     },
     {
-      "id": 6,
+      "id": 5,
       "parent": 1,
       "transform": [
         [1, 0, 0, 0],

third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-out-of-view-with-backdrop-filter-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-out-of-view-with-backdrop-filter-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-out-of-view-with-backdrop-filter-expected.txt
index ae79be88..b962ebe7 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-out-of-view-with-backdrop-filter-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-out-of-view-with-backdrop-filter-expected.txt
@@ -1,66 +1,27 @@
 {
   "layers": [
     {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 1532],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='fixed'",
+      "bounds": [15, 15],
+      "contentsOpaqueForText": true
+    },
+    {
       "name": "LayoutNGBlockFlow HTML",
-      "bounds": [1178, 1532]
+      "position": [12, 20],
+      "bounds": [1154, 1500],
+      "contentsOpaqueForText": true,
+      "drawsContent": false
     },
     {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='fixed'",
-      "bounds": [15, 15],
-      "transform": 1
-    },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='fixed'",
-      "bounds": [15, 15],
-      "transform": 2
-    },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='fixed'",
-      "bounds": [15, 15],
-      "transform": 3
-    },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='fixed'",
-      "bounds": [15, 15]
-    },
-    {
-      "name": "LayoutNGBlockFlow HTML (foreground) Layer",
-      "bounds": [1178, 1532]
-    },
-    {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
-    }
-  ],
-  "transforms": [
-    {
-      "id": 1,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [12, 1520, 0, 1]
-      ]
-    },
-    {
-      "id": 2,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [12, -150, 0, 1]
-      ]
-    },
-    {
-      "id": 3,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [1500, 0, 0, 1]
-      ]
+      "bounds": [22, 900]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-under-transform-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-under-transform-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-under-transform-expected.txt
index 14498ab8..6819c265 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-under-transform-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-under-transform-expected.txt
@@ -1,16 +1,17 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 7532],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "transform": 1
     },
     {
-      "name": "LayoutNGBlockFlow DIV id='transform'",
+      "name": "LayoutNGBlockFlow (positioned) DIV id='indicator'",
       "position": [150, 150],
       "bounds": [384, 384],
+      "contentsOpaque": true,
       "backgroundColor": "#FF0000",
       "transform": 3
     },
@@ -21,10 +22,9 @@
       "backgroundColor": "#008000"
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/impl-thread-scrolling-non-composited-fixed-no-scroll-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/impl-thread-scrolling-non-composited-fixed-no-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/impl-thread-scrolling-non-composited-fixed-no-scroll-expected.txt
index f4d2384..1604398 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/impl-thread-scrolling-non-composited-fixed-no-scroll-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/impl-thread-scrolling-non-composited-fixed-no-scroll-expected.txt
@@ -2,10 +2,15 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='fixed'",
+      "position": [15, 15],
+      "bounds": [58, 27]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/main-thread-scrolling-non-composited-fixed-overflow-hidden-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/main-thread-scrolling-non-composited-fixed-overflow-hidden-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/main-thread-scrolling-non-composited-fixed-overflow-hidden-expected.txt
index 42ab670..6e22964 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/main-thread-scrolling-non-composited-fixed-overflow-hidden-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/main-thread-scrolling-non-composited-fixed-overflow-hidden-expected.txt
@@ -2,7 +2,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 7532],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/no-compositing-for-fixed-position-under-transform-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/no-compositing-for-fixed-position-under-transform-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/no-compositing-for-fixed-position-under-transform-expected.txt
index 236a135..c602c6f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/no-compositing-for-fixed-position-under-transform-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/no-compositing-for-fixed-position-under-transform-expected.txt
@@ -2,7 +2,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overflow-hidden-scroll-with-fixed-overlap-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overflow-hidden-scroll-with-fixed-overlap-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overflow-hidden-scroll-with-fixed-overlap-expected.txt
index f185dcf..65fbfd4 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overflow-hidden-scroll-with-fixed-overlap-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overflow-hidden-scroll-with-fixed-overlap-expected.txt
@@ -2,30 +2,17 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "LayoutView #document",
-      "bounds": [450, 225],
-      "transform": 1
-    },
-    {
       "name": "LayoutNGBlockFlow (positioned) DIV class='fixed'",
       "bounds": [45, 45],
       "contentsOpaque": true,
       "backgroundColor": "#0000FF",
       "transform": 2
-    },
-    {
-      "name": "LayoutNGBlockFlow (relative positioned) DIV class='overlapped'",
-      "position": [12, 1512],
-      "bounds": [60, 60],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFA500",
-      "transform": 1
     }
   ],
   "transforms": [
@@ -55,17 +42,12 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "LayoutView #document",
-      "bounds": [450, 225],
-      "transform": 1
-    },
-    {
       "name": "LayoutNGBlockFlow (positioned) DIV class='fixed'",
       "bounds": [45, 45],
       "contentsOpaque": true,

third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overflow-scroll-overlap-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overflow-scroll-overlap-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overflow-scroll-overlap-expected.txt
index 97e6dea..0fd18703 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overflow-scroll-overlap-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overflow-scroll-overlap-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -16,18 +16,36 @@
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='scroller' class='overflow'",
       "bounds": [456, 306],
+      "contentsOpaqueForText": true,
       "transform": 2
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "LayoutNGBlockFlow (positioned) DIV id='scroller' class='overflow'",
+      "position": [3, 3],
+      "bounds": [428, 300],
+      "drawsContent": false,
+      "transform": 2
+    },
+    {
+      "name": "VerticalScrollbar",
       "position": [431, 3],
       "bounds": [22, 300],
       "transform": 2
     },
     {
-      "name": "Scrolling Contents Layer",
-      "position": [3, 3],
-      "bounds": [428, 548],
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='box'",
+      "position": [33, 86],
+      "bounds": [300, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#0000FF",
+      "transform": 3
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='box'",
+      "position": [33, 318],
+      "bounds": [315, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#0000FF",
       "transform": 3
     }
   ],

third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-animation-clipping-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-animation-clipping-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-animation-clipping-expected.txt
index c4ffb30..fcf51754 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-animation-clipping-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-animation-clipping-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 1218],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -49,10 +49,9 @@
       "backgroundColor": "#FFFF00"
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-animation-container-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-animation-container-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-animation-container-expected.txt
index 5fdae84b..55b832b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-animation-container-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-animation-container-expected.txt
@@ -2,7 +2,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 1203],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -17,7 +17,8 @@
     {
       "name": "LayoutNGBlockFlow (relative positioned) DIV class='container'",
       "position": [71, 345],
-      "bounds": [215, 678],
+      "bounds": [216, 678],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#FFFFFF"
     },
     {
@@ -28,17 +29,16 @@
       "transform": 4
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (relative positioned) DIV class='box yellow')",
-      "position": [-77, 676],
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='box yellow'",
+      "position": [27, 1038],
       "bounds": [150, 150],
-      "backgroundColor": "#FFFF00",
-      "transform": 3
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFF00"
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [
@@ -87,7 +87,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 1203],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -114,16 +114,22 @@
       "transform": 4
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (relative positioned) DIV id='first-green-box' class='box green rotate-45deg')",
-      "position": [-77, 132],
-      "bounds": [259, 694],
-      "transform": 3
+      "name": "LayoutNGBlockFlow (relative positioned) DIV id='first-green-box' class='box green rotate-45deg'",
+      "position": [71, 494],
+      "bounds": [216, 514],
+      "contentsOpaqueForText": true
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='box yellow'",
+      "position": [27, 1038],
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFF00"
+    },
+    {
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-animation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-animation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-animation-expected.txt
index c7da6d1..64aace0 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-animation-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-animation-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -15,17 +15,9 @@
     },
     {
       "name": "LayoutNGBlockFlow (relative positioned) DIV class='box'",
-      "position": [29, 194],
-      "bounds": [150, 150],
-      "contentsOpaque": true,
-      "backgroundColor": "#0000FF"
-    },
-    {
-      "name": "LayoutNGBlockFlow (relative positioned) DIV class='box'",
-      "position": [27, 390],
-      "bounds": [150, 150],
-      "contentsOpaque": true,
-      "backgroundColor": "#0000FF"
+      "position": [27, 194],
+      "bounds": [152, 346],
+      "contentsOpaqueForText": true
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-child-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-child-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-child-layer-expected.txt
index 103255d5..0ccd6672 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-child-layer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-child-layer-expected.txt
@@ -1,13 +1,13 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "LayoutNGBlockFlow (positioned) DIV id='container'",
+      "name": "LayoutNGBlockFlow (positioned) DIV id='red'",
       "position": [-600, 0],
       "bounds": [384, 384],
       "contentsOpaque": true,
@@ -15,11 +15,10 @@
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV id='green')",
-      "position": [-600, 0],
+      "name": "LayoutNGBlockFlow (positioned) DIV id='green'",
       "bounds": [450, 450],
-      "backgroundColor": "#008000",
-      "transform": 1
+      "contentsOpaque": true,
+      "backgroundColor": "#008000"
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-clipping-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-clipping-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-clipping-expected.txt
index af1223f2..dcccb8c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-clipping-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-clipping-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -21,11 +21,11 @@
       "transform": 2
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV id='overlap')",
-      "position": [600, 0],
+      "name": "LayoutNGBlockFlow (positioned) DIV id='overlap'",
+      "position": [675, 300],
       "bounds": [150, 150],
-      "backgroundColor": "#0000FF",
-      "transform": 2
+      "contentsOpaque": true,
+      "backgroundColor": "#0000FF"
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-nested-fixed-position-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-nested-fixed-position-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-nested-fixed-position-expected.txt
index 48d9392..54990004 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-nested-fixed-position-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-nested-fixed-position-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 1592],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -27,16 +27,16 @@
       "backgroundColor": "#0000FF"
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (relative positioned) DIV class='overlapped with-nested')",
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='overlapped with-nested'",
       "position": [387, 342],
       "bounds": [30, 30],
+      "contentsOpaque": true,
       "backgroundColor": "#0000FF"
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transformed-3d-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transformed-3d-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transformed-3d-expected.txt
index 8005aee7..1f09429 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transformed-3d-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transformed-3d-expected.txt
@@ -2,7 +2,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -42,23 +42,31 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "LayoutNGBlockFlow (positioned) DIV id='green-box' class='box green center composited rotated-3d'",
+      "name": "LayoutNGBlockFlow (positioned) DIV id='green-box' class='box green center composited'",
       "bounds": [150, 150],
       "contentsOpaque": true,
       "backgroundColor": "#008000",
       "transform": 2
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV class='box top left')",
-      "position": [-150, -150],
-      "bounds": [450, 450],
-      "transform": 1
+      "name": "LayoutNGBlockFlow (positioned) DIV class='box top left'",
+      "position": [12, 12],
+      "bounds": [150, 450],
+      "contentsOpaque": true,
+      "backgroundColor": "#808080"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='box top right'",
+      "position": [312, 12],
+      "bounds": [150, 450],
+      "contentsOpaque": true,
+      "backgroundColor": "#808080"
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transformed-and-clipped-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transformed-and-clipped-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transformed-and-clipped-expected.txt
index 45f1b75c..ebdcb39 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transformed-and-clipped-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transformed-and-clipped-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -14,8 +14,9 @@
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV class='over')",
+      "name": "LayoutNGBlockFlow (positioned) DIV class='over'",
       "bounds": [150, 150],
+      "contentsOpaque": true,
       "backgroundColor": "#008000",
       "transform": 1
     }

third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transformed-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transformed-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transformed-layer-expected.txt
index d1dd8342..36ece76f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transformed-layer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transformed-layer-expected.txt
@@ -1,47 +1,10 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
-    },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV id='composited'",
-      "contentsOpaque": true,
-      "drawsContent": false,
-      "transform": 3
-    }
-  ],
-  "transforms": [
-    {
-      "id": 1,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [12, 12, 0, 1]
-      ]
-    },
-    {
-      "id": 2,
-      "parent": 1,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [-15, 0, 0, 1]
-      ]
-    },
-    {
-      "id": 3,
-      "parent": 2,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [600, 0, 0, 1]
-      ]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transformed-layer-with-transform-body-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transformed-layer-with-transform-body-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transformed-layer-with-transform-body-expected.txt
index 23077af..a93a617 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transformed-layer-with-transform-body-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transformed-layer-with-transform-body-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,13 +9,8 @@
     {
       "name": "LayoutNGBlockFlow BODY",
       "bounds": [1176, 876],
+      "contentsOpaqueForText": true,
       "transform": 1
-    },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV id='composited'",
-      "contentsOpaque": true,
-      "drawsContent": false,
-      "transform": 3
     }
   ],
   "transforms": [
@@ -27,26 +22,6 @@
         [0, 0, 1, 0],
         [12, 12, 0, 1]
       ]
-    },
-    {
-      "id": 2,
-      "parent": 1,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [-15, 0, 0, 1]
-      ]
-    },
-    {
-      "id": 3,
-      "parent": 2,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [600, 0, 0, 1]
-      ]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transformed-preserved-3d-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transformed-preserved-3d-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transformed-preserved-3d-expected.txt
index 896a0fc..8397d14 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transformed-preserved-3d-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transformed-preserved-3d-expected.txt
@@ -8,24 +8,12 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "LayoutNGBlockFlow (positioned) DIV id='green-box' class='center box-container'",
-      "position": [162, 162],
-      "contentsOpaque": true,
-      "drawsContent": false
-    },
-    {
-      "name": "LayoutNGBlockFlow DIV id='camera' class='rotate-3d-start'",
-      "contentsOpaque": true,
-      "drawsContent": false,
-      "transform": 3
-    },
-    {
       "name": "LayoutNGBlockFlow (positioned) DIV class='side side-1'",
       "bounds": [150, 150],
       "backgroundColor": "#00FF00CC",
@@ -68,10 +56,9 @@
       "transform": [
         [1, 0, 0, 0],
         [0, 1, 0, 0],
-        [0, 0, 1, -0.00333333333333333],
-        [0, 0, 0, 1]
-      ],
-      "origin": [237, 237]
+        [0, 0, 1, 0],
+        [162, 162, 0, 1]
+      ]
     },
     {
       "id": 2,
@@ -79,10 +66,10 @@
       "transform": [
         [1, 0, 0, 0],
         [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [162, 162, 0, 1]
+        [0, 0, 1, -0.00333333333333333],
+        [0, 0, 0, 1]
       ],
-      "flattenInheritedTransform": false
+      "origin": [75, 75]
     },
     {
       "id": 3,
@@ -217,24 +204,12 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "LayoutNGBlockFlow (positioned) DIV id='green-box' class='center box-container'",
-      "position": [162, 162],
-      "contentsOpaque": true,
-      "drawsContent": false
-    },
-    {
-      "name": "LayoutNGBlockFlow DIV id='camera' class='rotate-3d-start rotate-3d-end'",
-      "contentsOpaque": true,
-      "drawsContent": false,
-      "transform": 3
-    },
-    {
       "name": "LayoutNGBlockFlow (positioned) DIV class='side side-1'",
       "bounds": [150, 150],
       "backgroundColor": "#00FF00CC",
@@ -273,14 +248,16 @@
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='box top left'",
       "position": [12, 12],
-      "bounds": [150, 225],
+      "bounds": [150, 450],
       "contentsOpaque": true,
       "backgroundColor": "#808080"
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV class='box top right')",
-      "position": [12, 12],
-      "bounds": [450, 450]
+      "name": "LayoutNGBlockFlow (positioned) DIV class='box top right'",
+      "position": [312, 12],
+      "bounds": [150, 450],
+      "contentsOpaque": true,
+      "backgroundColor": "#808080"
     }
   ],
   "transforms": [
@@ -289,10 +266,9 @@
       "transform": [
         [1, 0, 0, 0],
         [0, 1, 0, 0],
-        [0, 0, 1, -0.00333333333333333],
-        [0, 0, 0, 1]
-      ],
-      "origin": [237, 237]
+        [0, 0, 1, 0],
+        [162, 162, 0, 1]
+      ]
     },
     {
       "id": 2,
@@ -300,10 +276,10 @@
       "transform": [
         [1, 0, 0, 0],
         [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [162, 162, 0, 1]
+        [0, 0, 1, -0.00333333333333333],
+        [0, 0, 0, 1]
       ],
-      "flattenInheritedTransform": false
+      "origin": [75, 75]
     },
     {
       "id": 3,

third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transforms-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transforms-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transforms-expected.txt
index 00a4141..14eebba 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transforms-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transforms-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/remove-clipping-layer-with-no-children-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/remove-clipping-layer-with-no-children-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/remove-clipping-layer-with-no-children-expected.txt
index 7e091f9..7abe1eee 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/remove-clipping-layer-with-no-children-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/remove-clipping-layer-with-no-children-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/rotate3d-overlap-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/rotate3d-overlap-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/rotate3d-overlap-expected.txt
index 490b1f0..5136975 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/rotate3d-overlap-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/rotate3d-overlap-expected.txt
@@ -3,7 +3,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -12,6 +12,7 @@
       "name": "LayoutNGBlockFlow (relative positioned) DIV class='box translateZ'",
       "position": [-7, -7],
       "bounds": [164, 164],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#0000FF",
       "transform": 1
     },
@@ -19,29 +20,31 @@
       "name": "LayoutNGBlockFlow (relative positioned) DIV class='composited box rotate15'",
       "position": [-7, -7],
       "bounds": [164, 164],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#0000FF",
       "transform": 3
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (relative positioned) DIV class='box')",
-      "position": [-7, 173],
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='box'",
+      "position": [251, 215],
       "bounds": [164, 164],
-      "backgroundColor": "#0000FF",
-      "transform": 2
+      "contentsOpaqueForText": true,
+      "backgroundColor": "#0000FF"
     },
     {
       "name": "LayoutNGBlockFlow (relative positioned) DIV class='composited box rotate45'",
       "position": [-7, -7],
       "bounds": [164, 164],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#0000FF",
       "transform": 5
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (relative positioned) DIV class='box')",
-      "position": [-7, 173],
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='box'",
+      "position": [467, 215],
       "bounds": [164, 164],
-      "backgroundColor": "#0000FF",
-      "transform": 4
+      "contentsOpaqueForText": true,
+      "backgroundColor": "#0000FF"
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/scroll-partial-update-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/scroll-partial-update-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/scroll-partial-update-expected.txt
index 8b07b447..da79ef7 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/scroll-partial-update-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/scroll-partial-update-expected.txt
@@ -2,7 +2,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -10,31 +10,33 @@
     {
       "name": "LayoutNGBlockFlow DIV id='composited'",
       "bounds": [30, 30],
+      "contentsOpaqueForText": true,
       "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV id='overlay')",
-      "position": [3, 0],
+      "name": "LayoutNGBlockFlow (positioned) DIV id='overlay'",
+      "position": [15, 12],
       "bounds": [600, 306],
-      "transform": 1
+      "contentsOpaqueForText": true
     },
     {
       "name": "LayoutNGBlockFlow DIV id='scroller'",
-      "bounds": [300, 300],
+      "bounds": [278, 300],
+      "drawsContent": false,
       "transform": 2
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "position": [278, 0],
-      "bounds": [22, 300],
-      "transform": 2
-    },
-    {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
       "bounds": [278, 600],
       "backgroundColor": "#FFFF0080",
       "transform": 3
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [278, 0],
+      "bounds": [22, 300],
+      "transform": 2
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/spanOverlapsCanvas-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/spanOverlapsCanvas-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/spanOverlapsCanvas-expected.txt
index 27b46678..9d16e0c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/spanOverlapsCanvas-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/spanOverlapsCanvas-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -12,15 +12,11 @@
       "transform": 1
     },
     {
-      "name": "ContentsLayer for LayoutHTMLCanvas CANVAS id='world'",
+      "name": "LayoutNGBlockFlow (positioned) DIV id='output'",
+      "position": [12, 12],
       "bounds": [150, 75],
-      "transform": 1
-    },
-    {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV id='output')",
-      "bounds": [150, 75],
-      "backgroundColor": "#008000",
-      "transform": 1
+      "contentsOpaque": true,
+      "backgroundColor": "#008000"
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/squashing-into-ancestor-clipping-layer-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/squashing-into-ancestor-clipping-layer-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/squashing-into-ancestor-clipping-layer-change-expected.txt
index f910ad6..34a9075 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/squashing-into-ancestor-clipping-layer-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/squashing-into-ancestor-clipping-layer-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -14,10 +14,11 @@
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (relative positioned) DIV id='squashed')",
-      "bounds": [150, 150],
-      "backgroundColor": "#008000",
-      "transform": 1
+      "name": "LayoutNGBlockFlow (relative positioned) DIV id='squashed'",
+      "position": [12, 87],
+      "bounds": [150, 75],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000"
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/stacking-context-overlap-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/stacking-context-overlap-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/stacking-context-overlap-expected.txt
index 21b9a09..7a864d4 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/stacking-context-overlap-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/stacking-context-overlap-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -14,10 +14,10 @@
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (relative positioned) DIV class='container')",
-      "position": [0, 15],
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='container'",
+      "position": [12, 27],
       "bounds": [213, 213],
-      "transform": 1
+      "contentsOpaqueForText": true
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/stacking-context-overlap-nested-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/stacking-context-overlap-nested-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/stacking-context-overlap-nested-expected.txt
index f8807c6c1..639f92c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/stacking-context-overlap-nested-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/stacking-context-overlap-nested-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -10,6 +10,7 @@
       "name": "LayoutNGBlockFlow (positioned) DIV class='composited box'",
       "position": [-15, -15],
       "bounds": [180, 180],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#008000",
       "transform": 1
     },
@@ -17,6 +18,7 @@
       "name": "LayoutNGBlockFlow (positioned) DIV class='composited box'",
       "position": [-15, -15],
       "bounds": [330, 180],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#FF000099",
       "transform": 2
     },

third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/translatez-added-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/translatez-added-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/translatez-added-expected.txt
index d419d58c..9564a30 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/translatez-added-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/translatez-added-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/translatez-overlap-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/translatez-overlap-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/translatez-overlap-expected.txt
index 4ff5b5a..b8812c9 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/translatez-overlap-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/translatez-overlap-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/translatez-removed-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/translatez-removed-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/translatez-removed-expected.txt
index 7f87abd0..36ece76f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/translatez-removed-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/translatez-removed-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/compositing/masks/mask-layer-size-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/masks/mask-layer-size-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/masks/mask-layer-size-expected.txt
index 6598602..f605b2c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/masks/mask-layer-size-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/masks/mask-layer-size-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,12 +9,14 @@
     {
       "name": "LayoutNGBlockFlow DIV id='masked'",
       "bounds": [600, 300],
+      "contentsOpaque": true,
       "backgroundColor": "#000000",
       "transform": 1
     },
     {
-      "name": "Mask Layer",
+      "name": "LayoutNGBlockFlow DIV id='masked'",
       "bounds": [600, 300],
+      "contentsOpaqueForText": true,
       "transform": 1
     }
   ],

third_party/blink/web_tests/flag-specific/highdpi/compositing/nested-border-radius-composited-child-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/nested-border-radius-composited-child-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/nested-border-radius-composited-child-expected.png
index 71a6e64..ede357b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/nested-border-radius-composited-child-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/nested-border-radius-composited-child-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/accelerated-overflow-scroll-should-not-affect-perspective-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/accelerated-overflow-scroll-should-not-affect-perspective-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/accelerated-overflow-scroll-should-not-affect-perspective-expected.txt
index dce4e08..8f7388fc 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/accelerated-overflow-scroll-should-not-affect-perspective-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/accelerated-overflow-scroll-should-not-affect-perspective-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,27 +9,30 @@
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='container'",
       "bounds": [300, 300],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "LayoutNGBlockFlow (positioned) DIV class='container'",
+      "bounds": [278, 278],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
       "position": [0, 278],
-      "bounds": [278, 22],
+      "bounds": [300, 22],
+      "contentsOpaqueForText": true,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [278, 0],
       "bounds": [22, 278],
       "transform": 1
     },
     {
-      "name": "Scroll Corner Layer",
-      "position": [278, 278],
-      "bounds": [22, 22],
-      "transform": 1
-    },
-    {
       "name": "LayoutNGBlockFlow (positioned) DIV class='child first'",
       "bounds": [90, 300],
       "contentsOpaque": true,

third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/clip-content-under-overflow-controls-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/clip-content-under-overflow-controls-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/clip-content-under-overflow-controls-expected.png
index 231047f..72b516fa 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/clip-content-under-overflow-controls-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/clip-content-under-overflow-controls-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/clip-descendents-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/clip-descendents-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/clip-descendents-expected.txt
index 9bf40e53..4d921a23 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/clip-descendents-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/clip-descendents-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/content-gains-scrollbars-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/content-gains-scrollbars-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/content-gains-scrollbars-expected.txt
index 138aacec..44b0e1b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/content-gains-scrollbars-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/content-gains-scrollbars-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,10 +9,18 @@
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='container'",
       "bounds": [150, 150],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "LayoutNGBlockFlow (positioned) DIV class='container'",
+      "bounds": [128, 150],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
       "position": [128, 0],
       "bounds": [22, 150],
       "transform": 1
@@ -20,16 +28,25 @@
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='vertical' class='content tall'",
       "bounds": [15, 300],
+      "contentsOpaqueForText": true,
       "drawsContent": false,
       "transform": 1
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='container'",
       "bounds": [150, 150],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
       "transform": 2
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "LayoutNGBlockFlow (positioned) DIV class='container'",
+      "bounds": [150, 128],
+      "drawsContent": false,
+      "transform": 2
+    },
+    {
+      "name": "HorizontalScrollbar",
       "position": [0, 128],
       "bounds": [150, 22],
       "transform": 2
@@ -37,52 +54,59 @@
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='horizontal' class='content wide'",
       "bounds": [300, 15],
+      "contentsOpaqueForText": true,
       "drawsContent": false,
       "transform": 2
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='container'",
       "bounds": [150, 150],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
       "transform": 3
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "LayoutNGBlockFlow (positioned) DIV class='container'",
+      "bounds": [128, 128],
+      "drawsContent": false,
+      "transform": 3
+    },
+    {
+      "name": "HorizontalScrollbar",
       "position": [0, 128],
       "bounds": [128, 22],
       "transform": 3
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [128, 0],
       "bounds": [22, 128],
       "transform": 3
     },
     {
-      "name": "Scroll Corner Layer",
+      "name": "Scroll corner of LayoutNGBlockFlow (positioned) DIV class='container'",
       "position": [128, 128],
       "bounds": [22, 22],
+      "contentsOpaque": true,
       "transform": 3
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='both' class='content wide tall'",
       "bounds": [300, 300],
+      "contentsOpaqueForText": true,
       "drawsContent": false,
       "transform": 3
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='corner' class='container resizeWidget'",
       "bounds": [150, 150],
-      "transform": 4
-    },
-    {
-      "name": "Scroll Corner Layer",
-      "position": [128, 128],
-      "bounds": [22, 22],
+      "contentsOpaqueForText": true,
       "transform": 4
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='content'",
       "bounds": [15, 15],
+      "contentsOpaqueForText": true,
       "drawsContent": false,
       "transform": 4
     }

third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/content-loses-scrollbars-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/content-loses-scrollbars-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/content-loses-scrollbars-expected.txt
index f296625..4b37548 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/content-loses-scrollbars-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/content-loses-scrollbars-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,48 +9,56 @@
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='container'",
       "bounds": [150, 150],
+      "contentsOpaqueForText": true,
       "drawsContent": false,
       "transform": 1
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='vertical' class='content'",
       "bounds": [15, 15],
+      "contentsOpaqueForText": true,
       "drawsContent": false,
       "transform": 1
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='container'",
       "bounds": [150, 150],
+      "contentsOpaqueForText": true,
       "drawsContent": false,
       "transform": 2
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='horizontal' class='content'",
       "bounds": [15, 15],
+      "contentsOpaqueForText": true,
       "drawsContent": false,
       "transform": 2
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='container'",
       "bounds": [150, 150],
+      "contentsOpaqueForText": true,
       "drawsContent": false,
       "transform": 3
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='both' class='content'",
       "bounds": [15, 15],
+      "contentsOpaqueForText": true,
       "drawsContent": false,
       "transform": 3
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='corner' class='container'",
       "bounds": [150, 150],
+      "contentsOpaqueForText": true,
       "drawsContent": false,
       "transform": 4
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='content'",
       "bounds": [15, 15],
+      "contentsOpaqueForText": true,
       "drawsContent": false,
       "transform": 4
     }

third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents-expected.png
index 58d03810..5750cdd 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/nested-render-surfaces-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/nested-render-surfaces-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/nested-render-surfaces-expected.png
index c659c80..779e9fc 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/nested-render-surfaces-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/nested-render-surfaces-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-auto-with-touch-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-auto-with-touch-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-auto-with-touch-expected.txt
index 299bc6e..30ec1052 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-auto-with-touch-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-auto-with-touch-expected.txt
@@ -1,37 +1,40 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow DIV class='scroller'",
-      "bounds": [450, 450],
+      "bounds": [428, 428],
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 428],
       "bounds": [428, 22],
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [428, 0],
       "bounds": [22, 428],
       "transform": 1
     },
     {
-      "name": "Scroll Corner Layer",
+      "name": "Scroll corner of LayoutNGBlockFlow DIV class='scroller'",
       "position": [428, 428],
       "bounds": [22, 22],
+      "contentsOpaque": true,
       "transform": 1
     },
     {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow DIV class='scroller'",
       "bounds": [1500, 1500],
+      "contentsOpaque": true,
       "backgroundColor": "#C0C0C0",
       "transform": 1
     }

third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-auto-with-touch-no-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-auto-with-touch-no-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-auto-with-touch-no-overflow-expected.txt
index 7f87abd0..36ece76f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-auto-with-touch-no-overflow-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-auto-with-touch-no-overflow-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-auto-with-touch-toggle-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-auto-with-touch-toggle-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-auto-with-touch-toggle-expected.txt
index 299bc6e..30ec1052 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-auto-with-touch-toggle-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-auto-with-touch-toggle-expected.txt
@@ -1,37 +1,40 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow DIV class='scroller'",
-      "bounds": [450, 450],
+      "bounds": [428, 428],
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 428],
       "bounds": [428, 22],
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [428, 0],
       "bounds": [22, 428],
       "transform": 1
     },
     {
-      "name": "Scroll Corner Layer",
+      "name": "Scroll corner of LayoutNGBlockFlow DIV class='scroller'",
       "position": [428, 428],
       "bounds": [22, 22],
+      "contentsOpaque": true,
       "transform": 1
     },
     {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow DIV class='scroller'",
       "bounds": [1500, 1500],
+      "contentsOpaque": true,
       "backgroundColor": "#C0C0C0",
       "transform": 1
     }

third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-hidden-with-touch-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-hidden-with-touch-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-hidden-with-touch-expected.txt
index 8b0c8096..df77baf 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-hidden-with-touch-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-hidden-with-touch-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#C0C0C0"

third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-overlay-with-touch-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-overlay-with-touch-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-overlay-with-touch-expected.txt
index e7b29bc6..48b0b84 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-overlay-with-touch-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-overlay-with-touch-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,30 +9,33 @@
     {
       "name": "LayoutNGBlockFlow DIV class='scroller'",
       "bounds": [450, 450],
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow DIV class='scroller'",
       "bounds": [1500, 1500],
+      "contentsOpaque": true,
       "backgroundColor": "#C0C0C0",
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 428],
       "bounds": [428, 22],
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [428, 0],
       "bounds": [22, 428],
       "transform": 1
     },
     {
-      "name": "Scroll Corner Layer",
+      "name": "Scroll corner of LayoutNGBlockFlow DIV class='scroller'",
       "position": [428, 428],
       "bounds": [22, 22],
+      "contentsOpaque": true,
       "transform": 1
     }
   ],

third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-overlay-with-touch-no-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-overlay-with-touch-no-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-overlay-with-touch-no-overflow-expected.txt
index 7f87abd0..36ece76f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-overlay-with-touch-no-overflow-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-overlay-with-touch-no-overflow-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-scroll-with-touch-no-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-scroll-with-touch-no-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-scroll-with-touch-no-overflow-expected.txt
index 7f87abd0..36ece76f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-scroll-with-touch-no-overflow-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-scroll-with-touch-no-overflow-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-scrollbar-gutter-layers-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-scrollbar-gutter-layers-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-scrollbar-gutter-layers-expected.txt
index 7f87abd0..36ece76f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-scrollbar-gutter-layers-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-scrollbar-gutter-layers-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-scrollbar-layers-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-scrollbar-layers-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-scrollbar-layers-expected.txt
index a87f1ff..31b9271f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-scrollbar-layers-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-scrollbar-layers-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,10 +9,18 @@
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='container'",
       "bounds": [150, 150],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "LayoutNGBlockFlow (positioned) DIV class='container'",
+      "bounds": [128, 150],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
       "position": [128, 0],
       "bounds": [22, 150],
       "transform": 1
@@ -20,16 +28,25 @@
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='content tall'",
       "bounds": [15, 300],
+      "contentsOpaqueForText": true,
       "drawsContent": false,
       "transform": 1
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='container'",
       "bounds": [150, 150],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
       "transform": 2
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "LayoutNGBlockFlow (positioned) DIV class='container'",
+      "bounds": [150, 128],
+      "drawsContent": false,
+      "transform": 2
+    },
+    {
+      "name": "HorizontalScrollbar",
       "position": [0, 128],
       "bounds": [150, 22],
       "transform": 2
@@ -37,52 +54,59 @@
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='content wide'",
       "bounds": [300, 15],
+      "contentsOpaqueForText": true,
       "drawsContent": false,
       "transform": 2
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='container'",
       "bounds": [150, 150],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
       "transform": 3
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "LayoutNGBlockFlow (positioned) DIV class='container'",
+      "bounds": [128, 128],
+      "drawsContent": false,
+      "transform": 3
+    },
+    {
+      "name": "HorizontalScrollbar",
       "position": [0, 128],
       "bounds": [128, 22],
       "transform": 3
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [128, 0],
       "bounds": [22, 128],
       "transform": 3
     },
     {
-      "name": "Scroll Corner Layer",
+      "name": "Scroll corner of LayoutNGBlockFlow (positioned) DIV class='container'",
       "position": [128, 128],
       "bounds": [22, 22],
+      "contentsOpaque": true,
       "transform": 3
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='content wide tall'",
       "bounds": [300, 300],
+      "contentsOpaqueForText": true,
       "drawsContent": false,
       "transform": 3
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='container resizeWidget'",
       "bounds": [150, 150],
-      "transform": 4
-    },
-    {
-      "name": "Scroll Corner Layer",
-      "position": [128, 128],
-      "bounds": [22, 22],
+      "contentsOpaqueForText": true,
       "transform": 4
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='content'",
       "bounds": [15, 15],
+      "contentsOpaqueForText": true,
       "drawsContent": false,
       "transform": 4
     }

third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-visible-with-touch-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-visible-with-touch-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-visible-with-touch-expected.txt
index 84c19e0..482accb 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-visible-with-touch-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-visible-with-touch-expected.txt
@@ -1,27 +1,26 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1512, 1512],
       "contentsOpaque": true,
       "backgroundColor": "#C0C0C0"
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 878],
-      "bounds": [1178, 22],
-      "contentsOpaque": true
+      "bounds": [1178, 22]
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 878],
-      "contentsOpaque": true
+      "bounds": [22, 878]
     },
     {
-      "name": "Scroll Corner Layer",
+      "name": "Scroll corner of LayoutView #document",
       "position": [1178, 878],
-      "bounds": [22, 22]
+      "bounds": [22, 22],
+      "contentsOpaque": true
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/relpos-under-abspos-border-radius-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/relpos-under-abspos-border-radius-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/relpos-under-abspos-border-radius-expected.png
index ed480437..89be6905 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/relpos-under-abspos-border-radius-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/relpos-under-abspos-border-radius-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/reparented-scrollbars-non-sc-anc-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/reparented-scrollbars-non-sc-anc-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/reparented-scrollbars-non-sc-anc-expected.txt
index a6ee47d..43224eb 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/reparented-scrollbars-non-sc-anc-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/reparented-scrollbars-non-sc-anc-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1812, 1232],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,34 +9,31 @@
     {
       "name": "LayoutNGBlockFlow DIV id='scroller'",
       "bounds": [1800, 1500],
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
       "bounds": [1800, 15000],
+      "contentsOpaque": true,
       "backgroundColor": "#008000",
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1790, 0],
       "bounds": [10, 1500],
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 890],
       "bounds": [1190, 10]
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1190, 0],
       "bounds": [10, 890]
-    },
-    {
-      "name": "Scroll Corner Layer",
-      "position": [1190, 890],
-      "bounds": [10, 10]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/resize-painting-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/resize-painting-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/resize-painting-expected.txt
index c56ac08..3edc78d 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/resize-painting-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/resize-painting-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,12 +9,7 @@
     {
       "name": "LayoutNGBlockFlow DIV class='resizable composited box'",
       "bounds": [150, 150],
-      "transform": 1
-    },
-    {
-      "name": "Scroll Corner Layer",
-      "position": [128, 128],
-      "bounds": [22, 22],
+      "contentsOpaqueForText": true,
       "transform": 1
     }
   ],

third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/rotate-then-clip-effect-interleave-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/rotate-then-clip-effect-interleave-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/rotate-then-clip-effect-interleave-expected.png
index 2a39f6a..9e830f1 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/rotate-then-clip-effect-interleave-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/rotate-then-clip-effect-interleave-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/rotate-then-clip-effect-interleave-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/rotate-then-clip-effect-interleave-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/rotate-then-clip-effect-interleave-expected.txt
index 391991c..a58aee95 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/rotate-then-clip-effect-interleave-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/rotate-then-clip-effect-interleave-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,6 +9,7 @@
     {
       "name": "LayoutNGBlockFlow DIV",
       "bounds": [360, 360],
+      "contentsOpaqueForText": true,
       "transform": 2
     },
     {

third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/rotate-then-clip-z-order-interleave-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/rotate-then-clip-z-order-interleave-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/rotate-then-clip-z-order-interleave-expected.txt
index 1180c73..798141a0 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/rotate-then-clip-z-order-interleave-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/rotate-then-clip-z-order-interleave-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scroll-parent-with-non-stacking-context-composited-ancestor-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scroll-parent-with-non-stacking-context-composited-ancestor-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scroll-parent-with-non-stacking-context-composited-ancestor-expected.txt
index 7509145..a18f96cb 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scroll-parent-with-non-stacking-context-composited-ancestor-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scroll-parent-with-non-stacking-context-composited-ancestor-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -16,7 +16,9 @@
     },
     {
       "name": "LayoutNGBlockFlow DIV id='scroller'",
-      "bounds": [153, 153],
+      "position": [2, 2],
+      "bounds": [150, 150],
+      "drawsContent": false,
       "backfaceVisibility": "hidden",
       "transform": 1
     },
@@ -30,21 +32,13 @@
     {
       "name": "LayoutNGBlockFlow (relative positioned) DIV class='scrolled'",
       "position": [8, 8],
-      "bounds": [90, 60],
-      "contentsOpaque": true,
-      "backfaceVisibility": "hidden",
-      "backgroundColor": "#0000FF",
-      "transform": 1
-    },
-    {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (relative positioned) DIV class='scrolled')",
-      "position": [7, 73],
-      "bounds": [91, 193],
+      "bounds": [90, 258],
+      "contentsOpaqueForText": true,
       "backfaceVisibility": "hidden",
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [142, 1],
       "bounds": [10, 150],
       "backfaceVisibility": "hidden",

third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scrollbar-layer-placement-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scrollbar-layer-placement-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scrollbar-layer-placement-expected.txt
index 82cf02ec..c2379fc 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scrollbar-layer-placement-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scrollbar-layer-placement-expected.txt
@@ -1,25 +1,27 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='outer A'",
-      "position": [-31, -31],
-      "bounds": [528, 441],
+      "position": [-32, -32],
+      "bounds": [529, 442],
+      "contentsOpaqueForText": true,
       "transform": 1
     },
     {
       "name": "LayoutNGBlockFlow (relative positioned) DIV class='scroller'",
-      "position": [-45, -45],
-      "bounds": [435, 345],
+      "position": [7, 7],
+      "bounds": [330, 240],
+      "drawsContent": false,
       "transform": 2
     },
     {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='scroller'",
       "position": [7, 7],
       "bounds": [330, 354],
       "contentsOpaque": true,
@@ -27,25 +29,27 @@
       "transform": 2
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [328, 7],
       "bounds": [10, 240],
       "transform": 2
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='outer B'",
-      "position": [-31, -31],
-      "bounds": [528, 441],
+      "position": [-32, -32],
+      "bounds": [529, 442],
+      "contentsOpaqueForText": true,
       "transform": 3
     },
     {
       "name": "LayoutNGBlockFlow DIV class='scroller'",
-      "position": [-45, -45],
-      "bounds": [435, 345],
+      "position": [7, 7],
+      "bounds": [330, 240],
+      "drawsContent": false,
       "transform": 4
     },
     {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow DIV class='scroller'",
       "position": [7, 7],
       "bounds": [330, 354],
       "contentsOpaque": true,
@@ -53,25 +57,27 @@
       "transform": 4
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [328, 7],
       "bounds": [10, 240],
       "transform": 4
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='outer C'",
-      "position": [-31, -31],
-      "bounds": [528, 441],
+      "position": [-32, -32],
+      "bounds": [529, 442],
+      "contentsOpaqueForText": true,
       "transform": 5
     },
     {
       "name": "LayoutNGBlockFlow DIV class='scroller'",
-      "position": [-45, -45],
-      "bounds": [435, 345],
+      "position": [8, 8],
+      "bounds": [330, 240],
+      "drawsContent": false,
       "transform": 6
     },
     {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow DIV class='scroller'",
       "position": [8, 8],
       "bounds": [330, 354],
       "contentsOpaque": true,
@@ -79,25 +85,27 @@
       "transform": 6
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [328, 7],
       "bounds": [10, 240],
       "transform": 6
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='outer D'",
-      "position": [-31, -31],
-      "bounds": [528, 441],
+      "position": [-32, -32],
+      "bounds": [529, 442],
+      "contentsOpaqueForText": true,
       "transform": 7
     },
     {
       "name": "LayoutNGBlockFlow DIV class='scroller'",
-      "position": [-45, -45],
-      "bounds": [435, 345],
+      "position": [8, 8],
+      "bounds": [330, 240],
+      "drawsContent": false,
       "transform": 8
     },
     {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow DIV class='scroller'",
       "position": [8, 8],
       "bounds": [330, 354],
       "contentsOpaque": true,
@@ -105,7 +113,7 @@
       "transform": 8
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [328, 7],
       "bounds": [10, 240],
       "transform": 8

third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scrollbar-layer-placement-negative-z-index-child-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scrollbar-layer-placement-negative-z-index-child-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scrollbar-layer-placement-negative-z-index-child-expected.txt
index aa8cfeaf..59fb581 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scrollbar-layer-placement-negative-z-index-child-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scrollbar-layer-placement-negative-z-index-child-expected.txt
@@ -1,15 +1,16 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='outer'",
-      "position": [-31, -31],
-      "bounds": [528, 441],
+      "position": [-32, -32],
+      "bounds": [529, 442],
+      "contentsOpaqueForText": true,
       "transform": 1
     },
     {
@@ -21,19 +22,21 @@
       "transform": 2
     },
     {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='outer' (foreground) Layer",
-      "position": [-31, -31],
-      "bounds": [528, 441],
-      "transform": 1
-    },
-    {
       "name": "LayoutNGBlockFlow DIV class='scroller'",
-      "position": [-45, -45],
-      "bounds": [435, 345],
+      "position": [-46, -46],
+      "bounds": [436, 346],
+      "contentsOpaqueForText": true,
       "transform": 2
     },
     {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow DIV class='scroller'",
+      "position": [7, 7],
+      "bounds": [330, 240],
+      "drawsContent": false,
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV class='scroller'",
       "position": [7, 7],
       "bounds": [330, 354],
       "contentsOpaque": true,
@@ -41,7 +44,7 @@
       "transform": 2
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [328, 7],
       "bounds": [10, 240],
       "transform": 2

third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scrollbar-layer-placement-negative-z-index-child-positioned-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scrollbar-layer-placement-negative-z-index-child-positioned-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scrollbar-layer-placement-negative-z-index-child-positioned-expected.txt
index b26a0608..63d1996 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scrollbar-layer-placement-negative-z-index-child-positioned-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scrollbar-layer-placement-negative-z-index-child-positioned-expected.txt
@@ -1,15 +1,16 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='outer'",
-      "position": [-31, -31],
-      "bounds": [528, 441],
+      "position": [-32, -32],
+      "bounds": [529, 442],
+      "contentsOpaqueForText": true,
       "transform": 1
     },
     {
@@ -21,19 +22,21 @@
       "transform": 2
     },
     {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='outer' (foreground) Layer",
-      "position": [-31, -31],
-      "bounds": [528, 441],
-      "transform": 1
-    },
-    {
       "name": "LayoutNGBlockFlow (relative positioned) DIV class='scroller'",
-      "position": [-45, -45],
-      "bounds": [435, 345],
+      "position": [-46, -46],
+      "bounds": [436, 346],
+      "contentsOpaqueForText": true,
       "transform": 2
     },
     {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='scroller'",
+      "position": [7, 7],
+      "bounds": [330, 240],
+      "drawsContent": false,
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='scroller'",
       "position": [7, 7],
       "bounds": [330, 354],
       "contentsOpaque": true,
@@ -41,7 +44,7 @@
       "transform": 2
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [328, 7],
       "bounds": [10, 240],
       "transform": 2

third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scrollbar-painting-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scrollbar-painting-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scrollbar-painting-expected.png
index 07fd07f..2eea9734 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scrollbar-painting-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scrollbar-painting-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scrolling-content-clip-to-viewport-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scrolling-content-clip-to-viewport-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scrolling-content-clip-to-viewport-expected.txt
index 87c2b7e..11ea1a8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scrolling-content-clip-to-viewport-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scrolling-content-clip-to-viewport-expected.txt
@@ -1,33 +1,32 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow DIV class='scroller'",
-      "bounds": [480, 510]
+      "bounds": [458, 488],
+      "drawsContent": false
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 488],
-      "bounds": [458, 22]
+      "bounds": [480, 22],
+      "contentsOpaqueForText": true
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [458, 0],
       "bounds": [22, 488]
     },
     {
-      "name": "Scroll Corner Layer",
-      "position": [458, 488],
-      "bounds": [22, 22]
-    },
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [458, 1836],
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='column'",
+      "position": [15, 15],
+      "bounds": [426, 1806],
+      "contentsOpaque": true,
       "backgroundColor": "#C0C0C0"
     }
   ]

third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/textarea-scroll-touch-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/textarea-scroll-touch-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/textarea-scroll-touch-expected.txt
index dd3c2f8..48fc44f5 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/textarea-scroll-touch-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/textarea-scroll-touch-expected.txt
@@ -2,30 +2,28 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGTextControlMultiLine TEXTAREA",
-      "bounds": [309, 189],
+      "position": [2, 2],
+      "bounds": [284, 186],
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "position": [286, 1],
-      "bounds": [22, 164],
+      "name": "Scroll corner of LayoutNGTextControlMultiLine TEXTAREA",
+      "position": [263, 143],
+      "bounds": [44, 44],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "Scroll Corner Layer",
-      "position": [285, 165],
-      "bounds": [22, 22],
-      "transform": 1
-    },
-    {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGTextControlMultiLine TEXTAREA",
       "position": [2, 2],
       "bounds": [284, 492],
       "contentsOpaque": true,
@@ -33,28 +31,64 @@
       "transform": 2
     },
     {
+      "name": "VerticalScrollbar",
+      "position": [286, 1],
+      "bounds": [22, 164],
+      "transform": 1
+    },
+    {
+      "name": "Scroll corner of LayoutNGTextControlMultiLine TEXTAREA",
+      "position": [285, 165],
+      "bounds": [22, 22],
+      "contentsOpaque": true,
+      "transform": 1
+    },
+    {
       "name": "LayoutNGTextControlMultiLine TEXTAREA",
-      "bounds": [309, 189],
+      "position": [4, 5],
+      "bounds": [282, 486],
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGTextControlMultiLine TEXTAREA",
+      "position": [2, 2],
+      "bounds": [284, 186],
+      "drawsContent": false,
       "transform": 3
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "Scroll corner of LayoutNGTextControlMultiLine TEXTAREA",
+      "position": [263, 143],
+      "bounds": [44, 44],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 3
+    },
+    {
+      "name": "LayoutNGTextControlMultiLine TEXTAREA",
+      "position": [2, 2],
+      "bounds": [284, 492],
+      "contentsOpaque": true,
+      "backgroundColor": "#CCCCCC",
+      "transform": 4
+    },
+    {
+      "name": "VerticalScrollbar",
       "position": [286, 1],
       "bounds": [22, 164],
       "transform": 3
     },
     {
-      "name": "Scroll Corner Layer",
+      "name": "Scroll corner of LayoutNGTextControlMultiLine TEXTAREA",
       "position": [285, 165],
       "bounds": [22, 22],
+      "contentsOpaque": true,
       "transform": 3
     },
     {
-      "name": "Scrolling Contents Layer",
-      "position": [2, 2],
-      "bounds": [284, 492],
-      "contentsOpaque": true,
-      "backgroundColor": "#CCCCCC",
+      "name": "LayoutNGTextControlMultiLine TEXTAREA",
+      "position": [4, 5],
+      "bounds": [282, 486],
       "transform": 4
     }
   ],

third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/universal-accelerated-overflow-scroll-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/universal-accelerated-overflow-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/universal-accelerated-overflow-scroll-expected.txt
index b0f0ebe0..2aad5ae 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/universal-accelerated-overflow-scroll-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/universal-accelerated-overflow-scroll-expected.txt
@@ -1,346 +1,298 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 3024],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow DIV id='container-absolute-grandchildren-not-contained' class='overflow'",
-      "bounds": [156, 156],
+      "position": [3, 3],
+      "bounds": [128, 128],
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [3, 131],
-      "bounds": [128, 22],
+      "bounds": [150, 22],
+      "contentsOpaqueForText": true,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [131, 3],
       "bounds": [22, 128],
       "transform": 1
     },
     {
-      "name": "Scroll Corner Layer",
-      "position": [131, 131],
-      "bounds": [22, 22],
-      "transform": 1
-    },
-    {
-      "name": "Scrolling Contents Layer",
-      "position": [3, 3],
-      "bounds": [128, 216],
+      "name": "LayoutNGBlockFlow DIV id='container-absolute-grandchildren-not-contained' class='overflow'",
+      "position": [3, 9],
+      "bounds": [128, 204],
+      "contentsOpaqueForText": true,
       "transform": 2
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV id='positioned-absolute-grandchildren-not-contained' class='positionAbsolute positioned')",
-      "position": [37, 97],
-      "bounds": [121, 61],
-      "backgroundColor": "#800080",
-      "transform": 1
-    },
-    {
-      "name": "LayoutNGBlockFlow (relative positioned) DIV id='scrolled-absolute-grandchildren-not-contained' class='scrolled'",
-      "position": [9, 51],
-      "bounds": [113, 36],
-      "contentsOpaque": true,
-      "backgroundColor": "#0000FF",
-      "transform": 2
-    },
-    {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (relative positioned) DIV id='scrolled-absolute-grandchildren-not-contained' class='scrolled')",
-      "position": [9, 135],
-      "bounds": [113, 36],
-      "backgroundColor": "#0000FF",
-      "transform": 2
+      "name": "LayoutNGBlockFlow (positioned) DIV id='positioned-absolute-grandchildren-not-contained' class='positionAbsolute positioned'",
+      "position": [15, 113],
+      "bounds": [158, 418],
+      "contentsOpaqueForText": true
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='container-absolute-grandchildren' class='positionAbsolute overflow'",
-      "bounds": [156, 156],
+      "position": [3, 3],
+      "bounds": [128, 128],
+      "drawsContent": false,
       "transform": 3
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [3, 131],
       "bounds": [128, 22],
       "transform": 3
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [131, 3],
       "bounds": [22, 128],
       "transform": 3
     },
     {
-      "name": "Scroll Corner Layer",
-      "position": [131, 131],
-      "bounds": [22, 22],
-      "transform": 3
+      "name": "Scroll corner of LayoutNGBlockFlow (positioned) DIV id='container-absolute-grandchildren' class='positionAbsolute overflow'",
+      "position": [326, 15],
+      "bounds": [385, 156],
+      "contentsOpaqueForText": true
     },
     {
-      "name": "Scrolling Contents Layer",
-      "position": [3, 3],
-      "bounds": [158, 216],
+      "name": "LayoutNGBlockFlow (positioned) DIV id='container-absolute-grandchildren' class='positionAbsolute overflow'",
+      "position": [3, 9],
+      "bounds": [158, 204],
+      "contentsOpaqueForText": true,
       "transform": 4
     },
     {
       "name": "LayoutNGBlockFlow DIV id='container-absolute-not-contained' class='overflow'",
-      "bounds": [156, 156],
+      "position": [3, 3],
+      "bounds": [128, 128],
+      "drawsContent": false,
       "transform": 5
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [3, 131],
-      "bounds": [128, 22],
+      "bounds": [150, 22],
+      "contentsOpaqueForText": true,
       "transform": 5
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [131, 3],
       "bounds": [22, 128],
       "transform": 5
     },
     {
-      "name": "Scroll Corner Layer",
-      "position": [131, 131],
-      "bounds": [22, 22],
-      "transform": 5
-    },
-    {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV id='positioned-absolute-not-contained' class='positionAbsolute positioned')",
-      "position": [37, 97],
-      "bounds": [121, 61],
-      "backgroundColor": "#800080",
-      "transform": 5
+      "name": "LayoutNGBlockFlow (positioned) DIV id='positioned-absolute-not-contained' class='positionAbsolute positioned'",
+      "position": [413, 113],
+      "bounds": [120, 60],
+      "contentsOpaque": true,
+      "backgroundColor": "#800080"
     },
     {
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='scrolled-absolute-not-contained' class='scrolled'",
-      "position": [9, 51],
-      "bounds": [113, 36],
-      "contentsOpaque": true,
-      "backgroundColor": "#0000FF",
-      "transform": 6
-    },
-    {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (relative positioned) DIV id='scrolled-absolute-not-contained' class='scrolled')",
-      "position": [9, 135],
-      "bounds": [113, 36],
-      "backgroundColor": "#0000FF",
+      "position": [9, 9],
+      "bounds": [113, 204],
+      "contentsOpaqueForText": true,
       "transform": 6
     },
     {
       "name": "LayoutNGBlockFlow DIV id='container-absolute-sibling-grandchildren-not-contained' class='overflow'",
-      "bounds": [156, 156],
+      "position": [3, 3],
+      "bounds": [128, 128],
+      "drawsContent": false,
       "transform": 7
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [3, 131],
-      "bounds": [128, 22],
+      "bounds": [150, 22],
+      "contentsOpaqueForText": true,
       "transform": 7
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [131, 3],
       "bounds": [22, 128],
       "transform": 7
     },
     {
-      "name": "Scroll Corner Layer",
-      "position": [131, 131],
-      "bounds": [22, 22],
-      "transform": 7
-    },
-    {
-      "name": "Scrolling Contents Layer",
-      "position": [3, 3],
-      "bounds": [128, 216],
+      "name": "LayoutNGBlockFlow DIV id='container-absolute-sibling-grandchildren-not-contained' class='overflow'",
+      "position": [3, 9],
+      "bounds": [128, 204],
+      "contentsOpaqueForText": true,
       "transform": 8
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV id='positioned-absolute-sibling-grandchildren-not-contained' class='positionAbsolute positioned')",
-      "position": [37, 97],
-      "bounds": [121, 61],
-      "backgroundColor": "#800080",
-      "transform": 7
-    },
-    {
-      "name": "LayoutNGBlockFlow (relative positioned) DIV id='scrolled-absolute-sibling-grandchildren-not-contained' class='scrolled'",
-      "position": [9, 51],
-      "bounds": [113, 36],
+      "name": "LayoutNGBlockFlow (positioned) DIV id='positioned-absolute-sibling-grandchildren-not-contained' class='positionAbsolute positioned'",
+      "position": [593, 113],
+      "bounds": [120, 60],
       "contentsOpaque": true,
-      "backgroundColor": "#0000FF",
-      "transform": 8
-    },
-    {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (relative positioned) DIV id='scrolled-absolute-sibling-grandchildren-not-contained' class='scrolled')",
-      "position": [9, 135],
-      "bounds": [113, 36],
-      "backgroundColor": "#0000FF",
-      "transform": 8
+      "backgroundColor": "#800080"
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='container-absolute-sibling-grandchildren' class='positionAbsolute overflow'",
-      "bounds": [156, 156],
+      "position": [3, 3],
+      "bounds": [128, 128],
+      "drawsContent": false,
       "transform": 9
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [3, 131],
       "bounds": [128, 22],
       "transform": 9
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [131, 3],
       "bounds": [22, 128],
       "transform": 9
     },
     {
-      "name": "Scroll Corner Layer",
-      "position": [131, 131],
-      "bounds": [22, 22],
-      "transform": 9
+      "name": "Scroll corner of LayoutNGBlockFlow (positioned) DIV id='container-absolute-sibling-grandchildren' class='positionAbsolute overflow'",
+      "position": [146, 195],
+      "bounds": [385, 156],
+      "contentsOpaqueForText": true
     },
     {
-      "name": "Scrolling Contents Layer",
-      "position": [3, 3],
-      "bounds": [158, 216],
+      "name": "LayoutNGBlockFlow (positioned) DIV id='container-absolute-sibling-grandchildren' class='positionAbsolute overflow'",
+      "position": [3, 9],
+      "bounds": [158, 204],
+      "contentsOpaqueForText": true,
       "transform": 10
     },
     {
       "name": "LayoutNGBlockFlow DIV id='container-absolute-sibling-not-contained' class='overflow'",
-      "bounds": [156, 156],
+      "position": [3, 3],
+      "bounds": [128, 128],
+      "drawsContent": false,
       "transform": 11
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [3, 131],
-      "bounds": [128, 22],
+      "bounds": [150, 22],
+      "contentsOpaqueForText": true,
       "transform": 11
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [131, 3],
       "bounds": [22, 128],
       "transform": 11
     },
     {
-      "name": "Scroll Corner Layer",
-      "position": [131, 131],
-      "bounds": [22, 22],
-      "transform": 11
-    },
-    {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV id='positioned-absolute-sibling-not-contained' class='positionAbsolute positioned')",
-      "position": [37, 97],
-      "bounds": [121, 61],
-      "backgroundColor": "#800080",
-      "transform": 11
+      "name": "LayoutNGBlockFlow (positioned) DIV id='positioned-absolute-sibling-not-contained' class='positionAbsolute positioned'",
+      "position": [195, 293],
+      "bounds": [158, 238],
+      "contentsOpaqueForText": true
     },
     {
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='scrolled-absolute-sibling-not-contained' class='scrolled'",
-      "position": [9, 51],
-      "bounds": [113, 36],
-      "contentsOpaque": true,
-      "backgroundColor": "#0000FF",
-      "transform": 12
-    },
-    {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (relative positioned) DIV id='scrolled-absolute-sibling-not-contained' class='scrolled')",
-      "position": [9, 135],
-      "bounds": [113, 36],
-      "backgroundColor": "#0000FF",
+      "position": [9, 9],
+      "bounds": [113, 162],
+      "contentsOpaqueForText": true,
       "transform": 12
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='container-absolute-sibling' class='positionAbsolute overflow'",
-      "bounds": [156, 156],
+      "position": [3, 3],
+      "bounds": [128, 128],
+      "drawsContent": false,
       "transform": 13
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [3, 131],
       "bounds": [128, 22],
       "transform": 13
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [131, 3],
       "bounds": [22, 128],
       "transform": 13
     },
     {
-      "name": "Scroll Corner Layer",
-      "position": [131, 131],
-      "bounds": [22, 22],
-      "transform": 13
+      "name": "Scroll corner of LayoutNGBlockFlow (positioned) DIV id='container-absolute-sibling' class='positionAbsolute overflow'",
+      "position": [506, 195],
+      "bounds": [205, 156],
+      "contentsOpaqueForText": true
     },
     {
-      "name": "Scrolling Contents Layer",
-      "position": [3, 3],
-      "bounds": [158, 216],
+      "name": "LayoutNGBlockFlow (positioned) DIV id='positioned-absolute-sibling' class='positionAbsolute positioned'",
+      "position": [9, 9],
+      "bounds": [152, 162],
+      "contentsOpaqueForText": true,
       "transform": 14
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='container-absolute' class='positionAbsolute overflow'",
-      "bounds": [156, 156],
+      "position": [3, 3],
+      "bounds": [128, 128],
+      "drawsContent": false,
       "transform": 15
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [3, 131],
       "bounds": [128, 22],
       "transform": 15
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [131, 3],
       "bounds": [22, 128],
       "transform": 15
     },
     {
-      "name": "Scroll Corner Layer",
-      "position": [131, 131],
-      "bounds": [22, 22],
-      "transform": 15
+      "name": "Scroll corner of LayoutNGBlockFlow (positioned) DIV id='container-absolute' class='positionAbsolute overflow'",
+      "position": [555, 326],
+      "bounds": [156, 205],
+      "contentsOpaqueForText": true
     },
     {
-      "name": "Scrolling Contents Layer",
-      "position": [3, 3],
-      "bounds": [158, 216],
+      "name": "LayoutNGBlockFlow (positioned) DIV id='positioned-absolute' class='positionAbsolute positioned'",
+      "position": [9, 9],
+      "bounds": [152, 162],
+      "contentsOpaqueForText": true,
       "transform": 16
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='container-fixed-sibling-grandchildren' class='positionAbsolute overflow'",
-      "bounds": [156, 156],
+      "position": [3, 3],
+      "bounds": [128, 128],
+      "drawsContent": false,
       "transform": 17
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [3, 131],
-      "bounds": [128, 22],
+      "bounds": [150, 22],
+      "contentsOpaqueForText": true,
       "transform": 17
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [131, 3],
       "bounds": [22, 128],
       "transform": 17
     },
     {
-      "name": "Scroll Corner Layer",
-      "position": [131, 131],
-      "bounds": [22, 22],
-      "transform": 17
-    },
-    {
-      "name": "Scrolling Contents Layer",
-      "position": [3, 3],
-      "bounds": [128, 216],
+      "name": "LayoutNGBlockFlow (positioned) DIV id='container-fixed-sibling-grandchildren' class='positionAbsolute overflow'",
+      "position": [3, 9],
+      "bounds": [128, 204],
+      "contentsOpaqueForText": true,
       "transform": 18
     },
     {
@@ -351,44 +303,26 @@
       "transform": 19
     },
     {
-      "name": "LayoutNGBlockFlow (relative positioned) DIV id='scrolled-fixed-sibling-grandchildren' class='scrolled'",
-      "position": [9, 51],
-      "bounds": [113, 36],
-      "contentsOpaque": true,
-      "backgroundColor": "#0000FF",
-      "transform": 18
-    },
-    {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (relative positioned) DIV id='scrolled-fixed-sibling-grandchildren' class='scrolled')",
-      "position": [9, 135],
-      "bounds": [113, 36],
-      "backgroundColor": "#0000FF",
-      "transform": 18
-    },
-    {
       "name": "LayoutNGBlockFlow (positioned) DIV id='container-fixed-sibling' class='positionAbsolute overflow'",
-      "bounds": [156, 156],
+      "position": [3, 3],
+      "bounds": [128, 128],
+      "drawsContent": false,
       "transform": 20
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [3, 131],
-      "bounds": [128, 22],
+      "bounds": [150, 22],
+      "contentsOpaqueForText": true,
       "transform": 20
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [131, 3],
       "bounds": [22, 128],
       "transform": 20
     },
     {
-      "name": "Scroll Corner Layer",
-      "position": [131, 131],
-      "bounds": [22, 22],
-      "transform": 20
-    },
-    {
       "name": "LayoutNGBlockFlow (positioned) DIV id='positioned-fixed-sibling' class='positionFixed positioned'",
       "bounds": [120, 60],
       "contentsOpaque": true,
@@ -397,46 +331,36 @@
     },
     {
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='scrolled-fixed-sibling' class='scrolled'",
-      "position": [9, 51],
-      "bounds": [113, 36],
-      "contentsOpaque": true,
-      "backgroundColor": "#0000FF",
-      "transform": 22
-    },
-    {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (relative positioned) DIV id='scrolled-fixed-sibling' class='scrolled')",
-      "position": [9, 135],
-      "bounds": [113, 36],
-      "backgroundColor": "#0000FF",
+      "position": [9, 9],
+      "bounds": [113, 162],
+      "contentsOpaqueForText": true,
       "transform": 22
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='container-fixed-grandchildren' class='positionAbsolute overflow'",
-      "bounds": [156, 156],
+      "position": [3, 3],
+      "bounds": [128, 128],
+      "drawsContent": false,
       "transform": 23
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [3, 131],
-      "bounds": [128, 22],
+      "bounds": [150, 22],
+      "contentsOpaqueForText": true,
       "transform": 23
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [131, 3],
       "bounds": [22, 128],
       "transform": 23
     },
     {
-      "name": "Scroll Corner Layer",
-      "position": [131, 131],
-      "bounds": [22, 22],
-      "transform": 23
-    },
-    {
-      "name": "Scrolling Contents Layer",
-      "position": [3, 3],
-      "bounds": [128, 216],
+      "name": "LayoutNGBlockFlow (positioned) DIV id='container-fixed-grandchildren' class='positionAbsolute overflow'",
+      "position": [3, 9],
+      "bounds": [128, 204],
+      "contentsOpaqueForText": true,
       "transform": 24
     },
     {
@@ -447,44 +371,26 @@
       "transform": 25
     },
     {
-      "name": "LayoutNGBlockFlow (relative positioned) DIV id='scrolled-fixed-grandchildren' class='scrolled'",
-      "position": [9, 51],
-      "bounds": [113, 36],
-      "contentsOpaque": true,
-      "backgroundColor": "#0000FF",
-      "transform": 24
-    },
-    {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (relative positioned) DIV id='scrolled-fixed-grandchildren' class='scrolled')",
-      "position": [9, 135],
-      "bounds": [113, 36],
-      "backgroundColor": "#0000FF",
-      "transform": 24
-    },
-    {
       "name": "LayoutNGBlockFlow (positioned) DIV id='container-fixed' class='positionAbsolute overflow'",
-      "bounds": [156, 156],
+      "position": [3, 3],
+      "bounds": [128, 128],
+      "drawsContent": false,
       "transform": 26
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [3, 131],
-      "bounds": [128, 22],
+      "bounds": [150, 22],
+      "contentsOpaqueForText": true,
       "transform": 26
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [131, 3],
       "bounds": [22, 128],
       "transform": 26
     },
     {
-      "name": "Scroll Corner Layer",
-      "position": [131, 131],
-      "bounds": [22, 22],
-      "transform": 26
-    },
-    {
       "name": "LayoutNGBlockFlow (positioned) DIV id='positioned-fixed' class='positionFixed positioned'",
       "bounds": [120, 60],
       "contentsOpaque": true,
@@ -493,17 +399,9 @@
     },
     {
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='scrolled-fixed' class='scrolled'",
-      "position": [9, 51],
-      "bounds": [113, 36],
-      "contentsOpaque": true,
-      "backgroundColor": "#0000FF",
-      "transform": 28
-    },
-    {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (relative positioned) DIV id='scrolled-fixed' class='scrolled')",
-      "position": [9, 135],
-      "bounds": [113, 36],
-      "backgroundColor": "#0000FF",
+      "position": [9, 9],
+      "bounds": [113, 162],
+      "contentsOpaqueForText": true,
       "transform": 28
     },
     {
@@ -550,177 +448,79 @@
     },
     {
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='scrolled-absolute-grandchildren-not-contained' class='scrolled onTop'",
-      "position": [9, 9],
+      "position": [9, 177],
       "bounds": [113, 36],
       "contentsOpaque": true,
       "backgroundColor": "#0000FF",
       "transform": 2
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (relative positioned) DIV id='scrolled-absolute-grandchildren-not-contained' class='scrolled onTop')",
-      "position": [9, 93],
-      "bounds": [113, 120],
-      "transform": 2
-    },
-    {
-      "name": "LayoutNGBlockFlow (relative positioned) DIV id='scrolled-absolute-grandchildren' class='scrolled onTop'",
-      "position": [9, 9],
-      "bounds": [113, 36],
-      "contentsOpaque": true,
-      "backgroundColor": "#0000FF",
-      "transform": 4
-    },
-    {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (relative positioned) DIV id='scrolled-absolute-grandchildren' class='scrolled onTop')",
-      "position": [9, 93],
-      "bounds": [113, 120],
-      "transform": 4
-    },
-    {
-      "name": "LayoutNGBlockFlow (relative positioned) DIV id='scrolled-absolute-not-contained' class='scrolled onTop'",
-      "position": [9, 9],
-      "bounds": [113, 36],
-      "contentsOpaque": true,
-      "backgroundColor": "#0000FF",
-      "transform": 6
-    },
-    {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (relative positioned) DIV id='scrolled-absolute-not-contained' class='scrolled onTop')",
-      "position": [9, 93],
-      "bounds": [113, 120],
-      "transform": 6
-    },
-    {
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='scrolled-absolute-sibling-grandchildren-not-contained' class='scrolled onTop'",
-      "position": [9, 9],
-      "bounds": [113, 36],
-      "contentsOpaque": true,
-      "backgroundColor": "#0000FF",
-      "transform": 8
-    },
-    {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (relative positioned) DIV id='scrolled-absolute-sibling-grandchildren-not-contained' class='scrolled onTop')",
       "position": [9, 93],
       "bounds": [113, 120],
+      "contentsOpaqueForText": true,
       "transform": 8
     },
     {
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='scrolled-absolute-sibling-grandchildren' class='scrolled onTop'",
-      "position": [9, 9],
-      "bounds": [113, 36],
-      "contentsOpaque": true,
-      "backgroundColor": "#0000FF",
-      "transform": 10
-    },
-    {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (relative positioned) DIV id='scrolled-absolute-sibling-grandchildren' class='scrolled onTop')",
       "position": [9, 93],
       "bounds": [113, 120],
+      "contentsOpaqueForText": true,
       "transform": 10
     },
     {
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='scrolled-absolute-sibling-not-contained' class='scrolled onTop'",
-      "position": [9, 9],
-      "bounds": [113, 36],
-      "contentsOpaque": true,
-      "backgroundColor": "#0000FF",
-      "transform": 12
-    },
-    {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (relative positioned) DIV id='scrolled-absolute-sibling-not-contained' class='scrolled onTop')",
       "position": [9, 93],
       "bounds": [113, 120],
+      "contentsOpaqueForText": true,
       "transform": 12
     },
     {
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='scrolled-absolute-sibling' class='scrolled onTop'",
-      "position": [9, 9],
-      "bounds": [113, 36],
-      "contentsOpaque": true,
-      "backgroundColor": "#0000FF",
-      "transform": 14
-    },
-    {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (relative positioned) DIV id='scrolled-absolute-sibling' class='scrolled onTop')",
       "position": [9, 93],
       "bounds": [113, 120],
+      "contentsOpaqueForText": true,
       "transform": 14
     },
     {
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='scrolled-absolute' class='scrolled onTop'",
-      "position": [9, 9],
-      "bounds": [113, 36],
-      "contentsOpaque": true,
-      "backgroundColor": "#0000FF",
-      "transform": 16
-    },
-    {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (relative positioned) DIV id='scrolled-absolute' class='scrolled onTop')",
       "position": [9, 93],
       "bounds": [113, 120],
+      "contentsOpaqueForText": true,
       "transform": 16
     },
     {
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='scrolled-fixed-sibling-grandchildren' class='scrolled onTop'",
-      "position": [9, 9],
-      "bounds": [113, 36],
-      "contentsOpaque": true,
-      "backgroundColor": "#0000FF",
-      "transform": 18
-    },
-    {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (relative positioned) DIV id='scrolled-fixed-sibling-grandchildren' class='scrolled onTop')",
       "position": [9, 93],
       "bounds": [113, 120],
+      "contentsOpaqueForText": true,
       "transform": 18
     },
     {
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='scrolled-fixed-sibling' class='scrolled onTop'",
-      "position": [9, 9],
-      "bounds": [113, 36],
-      "contentsOpaque": true,
-      "backgroundColor": "#0000FF",
-      "transform": 22
-    },
-    {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (relative positioned) DIV id='scrolled-fixed-sibling' class='scrolled onTop')",
       "position": [9, 93],
       "bounds": [113, 120],
+      "contentsOpaqueForText": true,
       "transform": 22
     },
     {
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='scrolled-fixed-grandchildren' class='scrolled onTop'",
-      "position": [9, 9],
-      "bounds": [113, 36],
-      "contentsOpaque": true,
-      "backgroundColor": "#0000FF",
-      "transform": 24
-    },
-    {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (relative positioned) DIV id='scrolled-fixed-grandchildren' class='scrolled onTop')",
       "position": [9, 93],
       "bounds": [113, 120],
+      "contentsOpaqueForText": true,
       "transform": 24
     },
     {
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='scrolled-fixed' class='scrolled onTop'",
-      "position": [9, 9],
-      "bounds": [113, 36],
-      "contentsOpaque": true,
-      "backgroundColor": "#0000FF",
-      "transform": 28
-    },
-    {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (relative positioned) DIV id='scrolled-fixed' class='scrolled onTop')",
       "position": [9, 93],
       "bounds": [113, 120],
+      "contentsOpaqueForText": true,
       "transform": 28
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/nested-reflection-animated-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/nested-reflection-animated-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/nested-reflection-animated-expected.png
index 2adce99a..7469e7e 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/nested-reflection-animated-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/nested-reflection-animated-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/nested-reflection-transformed-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/nested-reflection-transformed-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/nested-reflection-transformed-expected.png
index ce72859..07d6b09 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/nested-reflection-transformed-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/nested-reflection-transformed-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/nested-reflection-transformed2-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/nested-reflection-transformed2-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/nested-reflection-transformed2-expected.png
index 0efe0e8..7bd873ac 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/nested-reflection-transformed2-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/nested-reflection-transformed2-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/reflection-in-composited-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/reflection-in-composited-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/reflection-in-composited-expected.png
index 66a7664..bd11bf6 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/reflection-in-composited-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/reflection-in-composited-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/compositing/rendering-contexts-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/rendering-contexts-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rendering-contexts-expected.txt
index 70f35e05..ad3b9ee1 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/rendering-contexts-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rendering-contexts-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-absolute-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-absolute-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-absolute-expected.txt
index e242679..e53bd65 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-absolute-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-absolute-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-absolute-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-absolute-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-absolute-overflow-expected.txt
index 5e5ec685..543355d 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-absolute-overflow-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-absolute-overflow-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1500, 1500],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -15,21 +15,20 @@
       "transform": 2
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 878],
-      "bounds": [1178, 22],
-      "contentsOpaque": true
+      "bounds": [1178, 22]
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 878],
-      "contentsOpaque": true
+      "bounds": [22, 878]
     },
     {
-      "name": "Scroll Corner Layer",
+      "name": "Scroll corner of LayoutView #document",
       "position": [1178, 878],
-      "bounds": [22, 22]
+      "bounds": [22, 22],
+      "contentsOpaque": true
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-absolute-overflow-scrolled-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-absolute-overflow-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-absolute-overflow-scrolled-expected.txt
index e4412069..cb13e40f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-absolute-overflow-scrolled-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-absolute-overflow-scrolled-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1500, 1500],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -15,21 +15,20 @@
       "transform": 2
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 878],
-      "bounds": [1178, 22],
-      "contentsOpaque": true
+      "bounds": [1178, 22]
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 878],
-      "contentsOpaque": true
+      "bounds": [22, 878]
     },
     {
-      "name": "Scroll Corner Layer",
+      "name": "Scroll corner of LayoutView #document",
       "position": [1178, 878],
-      "bounds": [22, 22]
+      "bounds": [22, 22],
+      "contentsOpaque": true
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-fixed-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-fixed-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-fixed-expected.txt
index e242679..cd1ff1c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-fixed-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-fixed-expected.txt
@@ -1,12 +1,19 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='positioned indicator'",
+      "position": [75, 75],
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#FF0000"
+    },
+    {
       "name": "LayoutNGBlockFlow (positioned) DIV class='positioned layer'",
       "bounds": [150, 150],
       "contentsOpaque": true,

third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-fixed-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-fixed-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-fixed-overflow-expected.txt
index 4d84296..663ec7b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-fixed-overflow-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-fixed-overflow-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1500, 1500],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -22,21 +22,20 @@
       "transform": 3
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 878],
-      "bounds": [1178, 22],
-      "contentsOpaque": true
+      "bounds": [1178, 22]
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 878],
-      "contentsOpaque": true
+      "bounds": [22, 878]
     },
     {
-      "name": "Scroll Corner Layer",
+      "name": "Scroll corner of LayoutView #document",
       "position": [1178, 878],
-      "bounds": [22, 22]
+      "bounds": [22, 22],
+      "contentsOpaque": true
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-fixed-overflow-scrolled-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-fixed-overflow-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-fixed-overflow-scrolled-expected.txt
index 5f473c4..ef761d2 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-fixed-overflow-scrolled-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-fixed-overflow-scrolled-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1500, 1500],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -22,21 +22,20 @@
       "transform": 3
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 878],
-      "bounds": [1178, 22],
-      "contentsOpaque": true
+      "bounds": [1178, 22]
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 878],
-      "contentsOpaque": true
+      "bounds": [22, 878]
     },
     {
-      "name": "Scroll Corner Layer",
+      "name": "Scroll corner of LayoutView #document",
       "position": [1178, 878],
-      "bounds": [22, 22]
+      "bounds": [22, 22],
+      "contentsOpaque": true
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-absolute-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-absolute-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-absolute-expected.txt
index abb46c1..e53bd65 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-absolute-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-absolute-expected.txt
@@ -1,18 +1,12 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "LayoutView #document",
-      "bounds": [600, 600],
-      "contentsOpaqueForText": true,
-      "backgroundColor": "#FFFFFF"
-    },
-    {
       "name": "LayoutNGBlockFlow (positioned) DIV class='positioned layer'",
       "bounds": [150, 150],
       "contentsOpaque": true,

third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-absolute-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-absolute-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-absolute-overflow-expected.txt
index 56a137c2..c1ff8879 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-absolute-overflow-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-absolute-overflow-expected.txt
@@ -1,39 +1,40 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "position": [22, 0],
       "bounds": [1500, 1500],
-      "contentsOpaqueForText": true,
+      "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "transform": 1
     },
     {
+      "name": "HorizontalScrollbar",
+      "position": [22, 578],
+      "bounds": [578, 22]
+    },
+    {
+      "name": "VerticalScrollbar",
+      "bounds": [22, 578]
+    },
+    {
+      "name": "Scroll corner of LayoutView #document",
+      "position": [0, 578],
+      "bounds": [22, 22],
+      "contentsOpaque": true
+    },
+    {
       "name": "LayoutNGBlockFlow (positioned) DIV class='positioned layer'",
       "bounds": [150, 150],
       "contentsOpaque": true,
       "backgroundColor": "#008000",
       "transform": 2
-    },
-    {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
-      "position": [22, 578],
-      "bounds": [578, 22]
-    },
-    {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "bounds": [22, 578]
-    },
-    {
-      "name": "Scroll Corner Layer",
-      "position": [0, 578],
-      "bounds": [22, 22]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-absolute-overflow-scrolled-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-absolute-overflow-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-absolute-overflow-scrolled-expected.txt
index a4fd7d7..e280f3bb 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-absolute-overflow-scrolled-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-absolute-overflow-scrolled-expected.txt
@@ -1,43 +1,40 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "LayoutIFrame (positioned) IFRAME",
-      "bounds": [600, 600]
-    },
-    {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "position": [22, 0],
       "bounds": [1500, 1500],
-      "contentsOpaqueForText": true,
+      "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "transform": 1
     },
     {
+      "name": "HorizontalScrollbar",
+      "position": [22, 578],
+      "bounds": [578, 22]
+    },
+    {
+      "name": "VerticalScrollbar",
+      "bounds": [22, 578]
+    },
+    {
+      "name": "Scroll corner of LayoutView #document",
+      "position": [0, 578],
+      "bounds": [22, 22],
+      "contentsOpaque": true
+    },
+    {
       "name": "LayoutNGBlockFlow (positioned) DIV id='layer' class='positioned'",
       "bounds": [150, 150],
       "contentsOpaque": true,
       "backgroundColor": "#008000",
       "transform": 2
-    },
-    {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
-      "position": [22, 578],
-      "bounds": [578, 22]
-    },
-    {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "bounds": [22, 578]
-    },
-    {
-      "name": "Scroll Corner Layer",
-      "position": [0, 578],
-      "bounds": [22, 22]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-fixed-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-fixed-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-fixed-expected.txt
index abb46c1..e53bd65 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-fixed-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-fixed-expected.txt
@@ -1,18 +1,12 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "LayoutView #document",
-      "bounds": [600, 600],
-      "contentsOpaqueForText": true,
-      "backgroundColor": "#FFFFFF"
-    },
-    {
       "name": "LayoutNGBlockFlow (positioned) DIV class='positioned layer'",
       "bounds": [150, 150],
       "contentsOpaque": true,

third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-fixed-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-fixed-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-fixed-overflow-expected.txt
index 61615a7..21f1c429 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-fixed-overflow-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-fixed-overflow-expected.txt
@@ -1,20 +1,35 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "position": [22, 0],
       "bounds": [1500, 1500],
-      "contentsOpaqueForText": true,
+      "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "transform": 1
     },
     {
+      "name": "HorizontalScrollbar",
+      "position": [22, 578],
+      "bounds": [578, 22]
+    },
+    {
+      "name": "VerticalScrollbar",
+      "bounds": [22, 578]
+    },
+    {
+      "name": "Scroll corner of LayoutView #document",
+      "position": [0, 578],
+      "bounds": [22, 22],
+      "contentsOpaque": true
+    },
+    {
       "name": "LayoutNGBlockFlow (positioned) DIV class='positioned indicator'",
       "bounds": [150, 150],
       "contentsOpaque": true,
@@ -27,20 +42,6 @@
       "contentsOpaque": true,
       "backgroundColor": "#008000",
       "transform": 3
-    },
-    {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
-      "position": [22, 578],
-      "bounds": [578, 22]
-    },
-    {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "bounds": [22, 578]
-    },
-    {
-      "name": "Scroll Corner Layer",
-      "position": [0, 578],
-      "bounds": [22, 22]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-fixed-overflow-scrolled-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-fixed-overflow-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-fixed-overflow-scrolled-expected.txt
index 24d04f6..21f1c429 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-fixed-overflow-scrolled-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-fixed-overflow-scrolled-expected.txt
@@ -1,24 +1,35 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "LayoutIFrame (positioned) IFRAME",
-      "bounds": [600, 600]
-    },
-    {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "position": [22, 0],
       "bounds": [1500, 1500],
-      "contentsOpaqueForText": true,
+      "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "transform": 1
     },
     {
+      "name": "HorizontalScrollbar",
+      "position": [22, 578],
+      "bounds": [578, 22]
+    },
+    {
+      "name": "VerticalScrollbar",
+      "bounds": [22, 578]
+    },
+    {
+      "name": "Scroll corner of LayoutView #document",
+      "position": [0, 578],
+      "bounds": [22, 22],
+      "contentsOpaque": true
+    },
+    {
       "name": "LayoutNGBlockFlow (positioned) DIV class='positioned indicator'",
       "bounds": [150, 150],
       "contentsOpaque": true,
@@ -31,20 +42,6 @@
       "contentsOpaque": true,
       "backgroundColor": "#008000",
       "transform": 3
-    },
-    {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
-      "position": [22, 578],
-      "bounds": [578, 22]
-    },
-    {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "bounds": [22, 578]
-    },
-    {
-      "name": "Scroll Corner Layer",
-      "position": [0, 578],
-      "bounds": [22, 22]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-relative-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-relative-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-relative-expected.txt
index 190c128..f293613 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-relative-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-relative-expected.txt
@@ -1,16 +1,12 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "LayoutView #document",
-      "bounds": [600, 600]
-    },
-    {
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='layer'",
       "bounds": [150, 150],
       "contentsOpaque": true,

third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-relative-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-relative-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-relative-expected.txt
index 2f55d5e..fc1847b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-relative-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-relative-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/compositing/scrollbar-painting-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/scrollbar-painting-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/scrollbar-painting-expected.png
index 231047f..72b516fa 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/scrollbar-painting-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/scrollbar-painting-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/compositing/scrollbars/nested-overlay-scrollbars-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/scrollbars/nested-overlay-scrollbars-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/scrollbars/nested-overlay-scrollbars-expected.txt
index d0263bf..24c19b38 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/scrollbars/nested-overlay-scrollbars-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/scrollbars/nested-overlay-scrollbars-expected.txt
@@ -1,53 +1,60 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='outer'",
-      "bounds": [606, 606],
-      "transform": 1
-    },
-    {
-      "name": "Scrolling Contents Layer",
       "position": [3, 3],
-      "bounds": [600, 1056],
-      "transform": 2
+      "bounds": [600, 600],
+      "drawsContent": false,
+      "transform": 1
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='inner'",
       "bounds": [306, 306],
+      "contentsOpaqueForText": true,
       "transform": 3
     },
     {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow (positioned) DIV id='inner'",
       "position": [3, 3],
-      "bounds": [7500, 13500],
+      "bounds": [300, 300],
+      "drawsContent": false,
       "transform": 3
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "LayoutNGBlockFlow (positioned) DIV id='inner'",
+      "position": [3, 3],
+      "bounds": [3000, 13500],
+      "contentsOpaqueForText": true,
+      "transform": 3
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='spacer'",
+      "position": [3, 3003],
+      "bounds": [7500, 1500],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 3
+    },
+    {
+      "name": "HorizontalScrollbar",
       "position": [3, 293],
       "bounds": [290, 10],
       "transform": 3
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [293, 3],
       "bounds": [10, 290],
       "transform": 3
     },
     {
-      "name": "Scroll Corner Layer",
-      "position": [293, 293],
-      "bounds": [10, 10],
-      "transform": 3
-    },
-    {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [593, 3],
       "bounds": [10, 600],
       "transform": 1

third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/add-remove-squashed-layers-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/add-remove-squashed-layers-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/add-remove-squashed-layers-expected.txt
index 1daa3969..daf420e 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/add-remove-squashed-layers-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/add-remove-squashed-layers-expected.txt
@@ -4,7 +4,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -17,11 +17,11 @@
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV id='A' class='overlap1')",
-      "position": [120, 120],
+      "name": "LayoutNGBlockFlow (positioned) DIV id='A' class='overlap1'",
+      "position": [210, 210],
       "bounds": [180, 180],
-      "backgroundColor": "#00FF00",
-      "transform": 1
+      "contentsOpaqueForText": true,
+      "backgroundColor": "#00FF00"
     }
   ],
   "transforms": [
@@ -41,7 +41,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -54,14 +54,14 @@
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV id='A' class='overlap1')",
-      "position": [120, 120],
+      "name": "LayoutNGBlockFlow (positioned) DIV id='A' class='overlap1'",
+      "position": [210, 210],
       "bounds": [210, 210],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#FF00FF",
       "invalidations": [
         [60, 60, 150, 150]
-      ],
-      "transform": 1
+      ]
     }
   ],
   "transforms": [
@@ -81,7 +81,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -94,14 +94,14 @@
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV id='A' class='overlap1')",
-      "position": [120, 120],
+      "name": "LayoutNGBlockFlow (positioned) DIV id='A' class='overlap1'",
+      "position": [210, 210],
       "bounds": [210, 210],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#FF00FF",
       "invalidations": [
         [30, 30, 150, 150]
-      ],
-      "transform": 1
+      ]
     }
   ],
   "transforms": [
@@ -121,7 +121,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -134,14 +134,14 @@
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV id='C' class='overlap3')",
-      "position": [180, 180],
+      "name": "LayoutNGBlockFlow (positioned) DIV id='C' class='overlap3'",
+      "position": [270, 270],
       "bounds": [150, 150],
+      "contentsOpaque": true,
       "backgroundColor": "#FF00FF",
       "invalidations": [
         [0, 0, 150, 150]
-      ],
-      "transform": 1
+      ]
     }
   ],
   "transforms": [
@@ -161,7 +161,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -174,15 +174,14 @@
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV id='B' class='overlap2')",
-      "position": [150, 150],
+      "name": "LayoutNGBlockFlow (positioned) DIV id='B' class='overlap2'",
+      "position": [240, 240],
       "bounds": [180, 180],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#FF00FF",
       "invalidations": [
-        [30, 30, 150, 150],
-        [0, 0, 150, 150]
-      ],
-      "transform": 1
+        [0, 0, 180, 180]
+      ]
     }
   ],
   "transforms": [
@@ -202,7 +201,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -215,15 +214,14 @@
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV id='A' class='overlap1')",
-      "position": [120, 120],
+      "name": "LayoutNGBlockFlow (positioned) DIV id='A' class='overlap1'",
+      "position": [210, 210],
       "bounds": [180, 180],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#00FF00",
       "invalidations": [
-        [30, 30, 150, 150],
-        [0, 0, 150, 150]
-      ],
-      "transform": 1
+        [0, 0, 180, 180]
+      ]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/clipping-ancestor-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/clipping-ancestor-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/clipping-ancestor-expected.txt
index 2764215a..1b1d532 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/clipping-ancestor-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/clipping-ancestor-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/composited-bounds-for-negative-z-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/composited-bounds-for-negative-z-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/composited-bounds-for-negative-z-expected.txt
index f32d0128..4f06a28 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/composited-bounds-for-negative-z-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/composited-bounds-for-negative-z-expected.txt
@@ -1,8 +1,10 @@
 {
   "layers": [
     {
-      "name": "LayoutNGBlockFlow HTML",
-      "bounds": [1200, 612]
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV",
@@ -12,23 +14,28 @@
       "transform": 1
     },
     {
-      "name": "LayoutNGBlockFlow HTML (foreground) Layer",
-      "bounds": [1200, 612]
+      "name": "LayoutNGBlockFlow HTML",
+      "position": [12, 150],
+      "bounds": [1176, 450],
+      "contentsOpaqueForText": true,
+      "drawsContent": false
     },
     {
       "name": "LayoutNGBlockFlow DIV",
-      "bounds": [450, 450],
+      "bounds": [428, 450],
+      "drawsContent": false,
       "transform": 2
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [428, 0],
       "bounds": [22, 450],
       "transform": 2
     },
     {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow (relative positioned) DIV",
       "bounds": [428, 1500],
+      "contentsOpaque": true,
       "backgroundColor": "#ADD8E6",
       "transform": 2
     }

third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/do-not-squash-non-self-painting-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/do-not-squash-non-self-painting-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/do-not-squash-non-self-painting-layer-expected.txt
index 535b362..7301e201 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/do-not-squash-non-self-painting-layer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/do-not-squash-non-self-painting-layer-expected.txt
@@ -2,28 +2,10 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
-    },
-    {
-      "name": "LayoutNGBlockFlow DIV id='composited-container'",
-      "contentsOpaque": true,
-      "drawsContent": false,
-      "backfaceVisibility": "hidden",
-      "transform": 1
-    }
-  ],
-  "transforms": [
-    {
-      "id": 1,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [12, 12, 0, 1]
-      ]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/frame-clip-squashed-scrolled-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/frame-clip-squashed-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/frame-clip-squashed-scrolled-expected.txt
index e06831e..dfd0ae77 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/frame-clip-squashed-scrolled-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/frame-clip-squashed-scrolled-expected.txt
@@ -1,23 +1,16 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 3054],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "transform": 1
     },
     {
-      "name": "LayoutNGBlockFlow DIV",
-      "contentsOpaque": true,
-      "drawsContent": false,
-      "transform": 2
-    },
-    {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [
@@ -29,16 +22,6 @@
         [0, 0, 1, 0],
         [0, -450, 0, 1]
       ]
-    },
-    {
-      "id": 2,
-      "parent": 1,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [12, 12, 0, 1]
-      ]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/iframes-are-never-squashed-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/iframes-are-never-squashed-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/iframes-are-never-squashed-expected.txt
index 9c914224..d317f53 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/iframes-are-never-squashed-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/iframes-are-never-squashed-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/invalidations-with-large-negative-margin-inline-content-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/invalidations-with-large-negative-margin-inline-content-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/invalidations-with-large-negative-margin-inline-content-expected.txt
index 13df74d4..0007b7a3 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/invalidations-with-large-negative-margin-inline-content-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/invalidations-with-large-negative-margin-inline-content-expected.txt
@@ -1,39 +1,37 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow DIV",
-      "bounds": [900, 300],
+      "bounds": [878, 278],
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 278],
-      "bounds": [878, 22],
+      "bounds": [900, 22],
+      "contentsOpaqueForText": true,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [878, 0],
       "bounds": [22, 278],
       "transform": 1
     },
     {
-      "name": "Scroll Corner Layer",
-      "position": [878, 278],
-      "bounds": [22, 22],
-      "transform": 1
-    },
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [878, 750],
+      "name": "LayoutNGBlockFlow (relative positioned) DIV",
+      "position": [0, 150],
+      "bounds": [878, 600],
+      "contentsOpaqueForText": true,
       "invalidations": [
-        [600, 150, 30, 30]
+        [600, 0, 30, 30]
       ],
       "transform": 1
     }

third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/invisible-layers-should-not-affect-geometry-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/invisible-layers-should-not-affect-geometry-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/invisible-layers-should-not-affect-geometry-expected.txt
index 0e69386..327897ce 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/invisible-layers-should-not-affect-geometry-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/invisible-layers-should-not-affect-geometry-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -14,10 +14,11 @@
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV class='box')",
+      "name": "LayoutNGBlockFlow (positioned) DIV class='box'",
+      "position": [15, 15],
       "bounds": [150, 150],
-      "backgroundColor": "#008000",
-      "transform": 1
+      "contentsOpaque": true,
+      "backgroundColor": "#008000"
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/keep-lcd-text-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/keep-lcd-text-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/keep-lcd-text-expected.txt
new file mode 100644
index 0000000..d26f365
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/keep-lcd-text-expected.txt
@@ -0,0 +1,22 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='composited'",
+      "bounds": [450, 450],
+      "contentsOpaqueForText": true,
+      "drawsContent": false
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='non-opaque'",
+      "bounds": [330, 405],
+      "backgroundColor": "#FFFF00"
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/move-squashing-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/move-squashing-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/move-squashing-layer-expected.txt
index 7824dbe..cff71b6 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/move-squashing-layer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/move-squashing-layer-expected.txt
@@ -3,7 +3,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -23,11 +23,11 @@
       "transform": 2
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (relative positioned) DIV id='squashed')",
-      "position": [-138, -138],
+      "name": "LayoutNGBlockFlow (relative positioned) DIV id='squashed'",
+      "position": [12, 12],
       "bounds": [150, 150],
-      "backgroundColor": "#0000FF",
-      "transform": 2
+      "contentsOpaque": true,
+      "backgroundColor": "#0000FF"
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/no-squashing-for-filters-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/no-squashing-for-filters-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/no-squashing-for-filters-expected.txt
index 5b67b3b..0a539489 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/no-squashing-for-filters-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/no-squashing-for-filters-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -15,15 +15,8 @@
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='trysquashed'",
-      "bounds": [75, 75],
-      "contentsOpaque": true,
-      "backgroundColor": "#D3D3D3"
-    },
-    {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV class='trysquashed')",
-      "position": [75, 75],
-      "bounds": [75, 75],
-      "backgroundColor": "#D3D3D3"
+      "bounds": [150, 150],
+      "contentsOpaqueForText": true
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/no-squashing-into-another-clip-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/no-squashing-into-another-clip-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/no-squashing-into-another-clip-layer-expected.txt
index 8401327..5eda55307 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/no-squashing-into-another-clip-layer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/no-squashing-into-another-clip-layer-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/no-squashing-into-fixed-position-that-clips-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/no-squashing-into-fixed-position-that-clips-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/no-squashing-into-fixed-position-that-clips-expected.txt
index 16b5cf8..d0c8d54 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/no-squashing-into-fixed-position-that-clips-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/no-squashing-into-fixed-position-that-clips-expected.txt
@@ -1,9 +1,16 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='fixedpos'",
+      "position": [0, 75],
+      "bounds": [1200, 825],
+      "contentsOpaque": true,
       "backgroundColor": "#ADD8E6"
     },
     {

third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/opacity-squashed-owner-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/opacity-squashed-owner-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/opacity-squashed-owner-expected.txt
index d386016..aef0e710 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/opacity-squashed-owner-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/opacity-squashed-owner-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -14,10 +14,10 @@
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV class='squashed')",
-      "position": [12, -6],
+      "name": "LayoutNGBlockFlow (positioned) DIV class='squashed'",
+      "position": [24, 6],
       "bounds": [60, 135],
-      "transform": 1
+      "contentsOpaqueForText": true
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/repaint-child-of-squashed-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/repaint-child-of-squashed-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/repaint-child-of-squashed-expected.txt
index c787ef5..2616601 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/repaint-child-of-squashed-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/repaint-child-of-squashed-expected.txt
@@ -2,7 +2,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -15,11 +15,11 @@
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV class='box top')",
-      "position": [120, 120],
+      "name": "LayoutNGBlockFlow (positioned) DIV class='box top'",
+      "position": [195, 195],
       "bounds": [150, 150],
-      "backgroundColor": "#00FFFF",
-      "transform": 1
+      "contentsOpaque": true,
+      "backgroundColor": "#00FFFF"
     }
   ],
   "transforms": [
@@ -39,7 +39,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -52,14 +52,14 @@
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV class='box top')",
-      "position": [120, 120],
+      "name": "LayoutNGBlockFlow (positioned) DIV class='box top'",
+      "position": [195, 195],
       "bounds": [150, 150],
+      "contentsOpaque": true,
       "backgroundColor": "#00FFFF",
       "invalidations": [
         [15, 15, 75, 75]
-      ],
-      "transform": 1
+      ]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/selection-repaint-with-gaps-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/selection-repaint-with-gaps-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/selection-repaint-with-gaps-expected.txt
index 772a6ef..1fcc541 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/selection-repaint-with-gaps-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/selection-repaint-with-gaps-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,17 +9,17 @@
     {
       "name": "LayoutNGBlockFlow DIV class='overlap'",
       "bounds": [450, 750],
+      "contentsOpaqueForText": true,
       "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV class='item')",
-      "position": [10, 40],
-      "bounds": [151, 316],
+      "name": "LayoutNGBlockFlow (positioned) DIV class='item'",
+      "position": [22, 53],
+      "bounds": [151, 315],
       "invalidations": [
-        [0, 121, 64, 54]
-      ],
-      "transform": 1
+        [0, 120, 64, 54]
+      ]
     }
   ],
   "transforms": [
@@ -37,7 +37,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -45,18 +45,18 @@
     {
       "name": "LayoutNGBlockFlow DIV class='overlap'",
       "bounds": [450, 750],
+      "contentsOpaqueForText": true,
       "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV class='item')",
-      "position": [10, 40],
-      "bounds": [151, 316],
+      "name": "LayoutNGBlockFlow (positioned) DIV class='item'",
+      "position": [22, 53],
+      "bounds": [151, 315],
       "invalidations": [
-        [0, 241, 64, 54],
-        [0, 121, 64, 54]
-      ],
-      "transform": 1
+        [0, 240, 64, 54],
+        [0, 120, 64, 54]
+      ]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-above-fixed-1-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-above-fixed-1-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-above-fixed-1-expected.txt
index e1155c58..e06ef9591 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-above-fixed-1-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-above-fixed-1-expected.txt
@@ -6,7 +6,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 2100],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -21,20 +21,13 @@
     {
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='paragraph-b' class='overlapping lime'",
       "position": [0, 150],
-      "bounds": [300, 150],
-      "contentsOpaque": true,
-      "backgroundColor": "#00FF00"
-    },
-    {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (relative positioned) DIV id='paragraph-c' class='overlapping cyan')",
-      "position": [0, 300],
-      "bounds": [300, 1650]
-    },
-    {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "position": [1178, 0],
-      "bounds": [22, 900],
+      "bounds": [300, 1950],
       "contentsOpaque": true
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
     }
   ],
   "transforms": [
@@ -54,7 +47,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 2100],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -70,22 +63,14 @@
     {
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='paragraph-b' class='overlapping lime'",
       "position": [0, 150],
-      "bounds": [300, 150],
+      "bounds": [300, 1950],
       "contentsOpaque": true,
-      "backgroundColor": "#00FF00",
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (relative positioned) DIV id='paragraph-c' class='overlapping cyan')",
-      "position": [0, 300],
-      "bounds": [300, 1650],
-      "transform": 1
-    },
-    {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [
@@ -114,7 +99,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 2100],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -130,22 +115,14 @@
     {
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='paragraph-b' class='overlapping lime'",
       "position": [0, 150],
-      "bounds": [300, 150],
+      "bounds": [300, 1950],
       "contentsOpaque": true,
-      "backgroundColor": "#00FF00",
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (relative positioned) DIV id='paragraph-c' class='overlapping cyan')",
-      "position": [0, 300],
-      "bounds": [300, 1650],
-      "transform": 1
-    },
-    {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [
@@ -174,7 +151,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 2100],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -190,22 +167,14 @@
     {
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='paragraph-b' class='overlapping lime'",
       "position": [0, 150],
-      "bounds": [300, 150],
+      "bounds": [300, 1950],
       "contentsOpaque": true,
-      "backgroundColor": "#00FF00",
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (relative positioned) DIV id='paragraph-c' class='overlapping cyan')",
-      "position": [0, 300],
-      "bounds": [300, 1650],
-      "transform": 1
-    },
-    {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-above-fixed-2-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-above-fixed-2-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-above-fixed-2-expected.txt
index fa98ba2..68ad92c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-above-fixed-2-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-above-fixed-2-expected.txt
@@ -4,7 +4,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 6075],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -17,13 +17,6 @@
       "backgroundColor": "#0000FF"
     },
     {
-      "name": "LayoutNGBlockFlow DIV id='compositedInsideFixed'",
-      "bounds": [75, 75],
-      "contentsOpaque": true,
-      "backfaceVisibility": "hidden",
-      "backgroundColor": "#FF0000"
-    },
-    {
       "name": "LayoutNGBlockFlow (positioned) DIV id='container'",
       "position": [150, 75],
       "bounds": [300, 6000],
@@ -31,10 +24,9 @@
       "backgroundColor": "#00FFFF"
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ]
 }
@@ -43,7 +35,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 6075],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -57,13 +49,6 @@
       "backgroundColor": "#0000FF"
     },
     {
-      "name": "LayoutNGBlockFlow DIV id='compositedInsideFixed'",
-      "bounds": [75, 75],
-      "contentsOpaque": true,
-      "backfaceVisibility": "hidden",
-      "backgroundColor": "#FF0000"
-    },
-    {
       "name": "LayoutNGBlockFlow (positioned) DIV id='container'",
       "position": [150, 75],
       "bounds": [300, 6000],
@@ -72,10 +57,9 @@
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-above-fixed-3-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-above-fixed-3-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-above-fixed-3-expected.txt
index 9460c2f1..75f0a07d 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-above-fixed-3-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-above-fixed-3-expected.txt
@@ -6,7 +6,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 6150],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -39,10 +39,9 @@
       "backgroundColor": "#00FF00"
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [
@@ -62,7 +61,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 6150],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -98,10 +97,9 @@
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [
@@ -130,7 +128,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 6150],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -166,10 +164,9 @@
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-compositing-hover-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-compositing-hover-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-compositing-hover-expected.txt
index a5ef2a27..a2766e6 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-compositing-hover-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-compositing-hover-expected.txt
@@ -4,30 +4,24 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "LayoutNGBlockFlow DIV class='composited'",
-      "contentsOpaque": true,
-      "drawsContent": false,
-      "transform": 1
-    },
-    {
       "name": "LayoutNGBlockFlow (positioned) DIV class='composited box behind'",
       "bounds": [150, 150],
       "contentsOpaque": true,
       "backgroundColor": "#0000FF",
-      "transform": 2
+      "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV class='box middle')",
-      "position": [120, 120],
+      "name": "LayoutNGBlockFlow (positioned) DIV class='box middle'",
+      "position": [270, 270],
       "bounds": [210, 210],
-      "backgroundColor": "#00FFFF",
-      "transform": 2
+      "contentsOpaqueForText": true,
+      "backgroundColor": "#00FFFF"
     }
   ],
   "transforms": [
@@ -37,15 +31,6 @@
         [1, 0, 0, 0],
         [0, 1, 0, 0],
         [0, 0, 1, 0],
-        [12, 12, 0, 1]
-      ]
-    },
-    {
-      "id": 2,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
         [150, 150, 0, 1]
       ]
     }
@@ -56,37 +41,31 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "LayoutNGBlockFlow DIV class='composited'",
-      "contentsOpaque": true,
-      "drawsContent": false,
-      "transform": 1
-    },
-    {
       "name": "LayoutNGBlockFlow (positioned) DIV class='composited box behind'",
       "bounds": [150, 150],
       "contentsOpaque": true,
       "backgroundColor": "#0000FF",
-      "transform": 2
+      "transform": 1
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='box middle'",
       "bounds": [150, 150],
       "contentsOpaque": true,
       "backgroundColor": "#008000",
-      "transform": 3
+      "transform": 2
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV class='box middle2')",
-      "position": [30, 30],
+      "name": "LayoutNGBlockFlow (positioned) DIV class='box middle2'",
+      "position": [300, 300],
       "bounds": [180, 180],
-      "backgroundColor": "#00FFFF",
-      "transform": 3
+      "contentsOpaqueForText": true,
+      "backgroundColor": "#00FFFF"
     }
   ],
   "transforms": [
@@ -96,20 +75,11 @@
         [1, 0, 0, 0],
         [0, 1, 0, 0],
         [0, 0, 1, 0],
-        [12, 12, 0, 1]
-      ]
-    },
-    {
-      "id": 2,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
         [150, 150, 0, 1]
       ]
     },
     {
-      "id": 3,
+      "id": 2,
       "transform": [
         [1, 0, 0, 0],
         [0, 1, 0, 0],
@@ -124,44 +94,38 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "LayoutNGBlockFlow DIV class='composited'",
-      "contentsOpaque": true,
-      "drawsContent": false,
-      "transform": 1
-    },
-    {
       "name": "LayoutNGBlockFlow (positioned) DIV class='composited box behind'",
       "bounds": [150, 150],
       "contentsOpaque": true,
       "backgroundColor": "#0000FF",
-      "transform": 2
+      "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV class='box middle')",
-      "position": [120, 120],
+      "name": "LayoutNGBlockFlow (positioned) DIV class='box middle'",
+      "position": [270, 270],
       "bounds": [150, 150],
-      "backgroundColor": "#00FF00",
-      "transform": 2
+      "contentsOpaque": true,
+      "backgroundColor": "#00FF00"
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='box middle2'",
       "bounds": [150, 150],
       "contentsOpaque": true,
       "backgroundColor": "#008000",
-      "transform": 3
+      "transform": 2
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV class='box top')",
-      "position": [30, 30],
+      "name": "LayoutNGBlockFlow (positioned) DIV class='box top'",
+      "position": [330, 330],
       "bounds": [150, 150],
-      "backgroundColor": "#00FFFF",
-      "transform": 3
+      "contentsOpaque": true,
+      "backgroundColor": "#00FFFF"
     }
   ],
   "transforms": [
@@ -171,20 +135,11 @@
         [1, 0, 0, 0],
         [0, 1, 0, 0],
         [0, 0, 1, 0],
-        [12, 12, 0, 1]
-      ]
-    },
-    {
-      "id": 2,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
         [150, 150, 0, 1]
       ]
     },
     {
-      "id": 3,
+      "id": 2,
       "transform": [
         [1, 0, 0, 0],
         [0, 1, 0, 0],
@@ -199,37 +154,31 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "LayoutNGBlockFlow DIV class='composited'",
-      "contentsOpaque": true,
-      "drawsContent": false,
-      "transform": 1
-    },
-    {
       "name": "LayoutNGBlockFlow (positioned) DIV class='composited box behind'",
       "bounds": [150, 150],
       "contentsOpaque": true,
       "backgroundColor": "#0000FF",
-      "transform": 2
+      "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV class='box middle')",
-      "position": [120, 120],
+      "name": "LayoutNGBlockFlow (positioned) DIV class='box middle'",
+      "position": [270, 270],
       "bounds": [180, 180],
-      "backgroundColor": "#FF00FF",
-      "transform": 2
+      "contentsOpaqueForText": true,
+      "backgroundColor": "#FF00FF"
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='box top'",
       "bounds": [150, 150],
       "contentsOpaque": true,
       "backgroundColor": "#008000",
-      "transform": 3
+      "transform": 2
     }
   ],
   "transforms": [
@@ -239,20 +188,11 @@
         [1, 0, 0, 0],
         [0, 1, 0, 0],
         [0, 0, 1, 0],
-        [12, 12, 0, 1]
-      ]
-    },
-    {
-      "id": 2,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
         [150, 150, 0, 1]
       ]
     },
     {
-      "id": 3,
+      "id": 2,
       "transform": [
         [1, 0, 0, 0],
         [0, 1, 0, 0],
@@ -267,30 +207,24 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "LayoutNGBlockFlow DIV class='composited'",
-      "contentsOpaque": true,
-      "drawsContent": false,
-      "transform": 1
-    },
-    {
       "name": "LayoutNGBlockFlow (positioned) DIV class='composited box behind'",
       "bounds": [150, 150],
       "contentsOpaque": true,
       "backgroundColor": "#0000FF",
-      "transform": 2
+      "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV class='box middle')",
-      "position": [120, 120],
+      "name": "LayoutNGBlockFlow (positioned) DIV class='box middle'",
+      "position": [270, 270],
       "bounds": [210, 210],
-      "backgroundColor": "#00FFFF",
-      "transform": 2
+      "contentsOpaqueForText": true,
+      "backgroundColor": "#00FFFF"
     }
   ],
   "transforms": [
@@ -300,15 +234,6 @@
         [1, 0, 0, 0],
         [0, 1, 0, 0],
         [0, 0, 1, 0],
-        [12, 12, 0, 1]
-      ]
-    },
-    {
-      "id": 2,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
         [150, 150, 0, 1]
       ]
     }

third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-onto-distant-relative-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-onto-distant-relative-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-onto-distant-relative-expected.txt
index f526824..36ece76f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-onto-distant-relative-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-onto-distant-relative-expected.txt
@@ -1,28 +1,10 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
-    },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV id='squashing'",
-      "bounds": [2, 2],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "transform": 1
-    }
-  ],
-  "transforms": [
-    {
-      "id": 1,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [-33554430, 0, 0, 1]
-      ]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-onto-nephew-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-onto-nephew-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-onto-nephew-expected.txt
index 54884e9..e2d8e27 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-onto-nephew-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-onto-nephew-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -14,10 +14,10 @@
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV class='box middle')",
-      "position": [-128, -128],
+      "name": "LayoutNGBlockFlow (positioned) DIV class='box middle'",
+      "position": [60, 60],
       "bounds": [270, 285],
-      "transform": 1
+      "contentsOpaqueForText": true
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-onto-transform-backing-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-onto-transform-backing-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-onto-transform-backing-expected.txt
index 12f8b28..2d760755 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-onto-transform-backing-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-onto-transform-backing-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -14,11 +14,11 @@
       "transform": 2
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV class='box middle')",
-      "position": [-120, -120],
+      "name": "LayoutNGBlockFlow (positioned) DIV class='box middle'",
+      "position": [30, 30],
       "bounds": [195, 195],
-      "backgroundColor": "#00FFFF",
-      "transform": 1
+      "contentsOpaqueForText": true,
+      "backgroundColor": "#00FFFF"
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-paint-invalidation-fixed-position-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-paint-invalidation-fixed-position-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-paint-invalidation-fixed-position-expected.txt
index bfa6430..5f532a3 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-paint-invalidation-fixed-position-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-paint-invalidation-fixed-position-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -16,18 +16,11 @@
     {
       "name": "LayoutNGBlockFlow (positioned) DIV",
       "position": [12, 38],
-      "bounds": [150, 150],
-      "contentsOpaque": true,
-      "backgroundColor": "#D3D3D3"
-    },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV id='foo'",
-      "position": [12, 75],
-      "bounds": [150, 150],
+      "bounds": [150, 187],
       "contentsOpaque": true,
       "backgroundColor": "#FF0000",
       "invalidations": [
-        [0, 0, 150, 150]
+        [0, 37, 150, 150]
       ]
     }
   ],
@@ -46,7 +39,7 @@
  {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -61,18 +54,11 @@
     {
       "name": "LayoutNGBlockFlow (positioned) DIV",
       "position": [12, 38],
-      "bounds": [150, 150],
-      "contentsOpaque": true,
-      "backgroundColor": "#D3D3D3"
-    },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV id='foo'",
-      "position": [12, 75],
-      "bounds": [150, 150],
+      "bounds": [150, 187],
       "contentsOpaque": true,
       "backgroundColor": "#0000FF",
       "invalidations": [
-        [0, 0, 150, 150]
+        [0, 37, 150, 150]
       ]
     }
   ],

third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-same-transform-ancestor-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-same-transform-ancestor-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-same-transform-ancestor-expected.txt
index 4559279..241727d 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-same-transform-ancestor-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-same-transform-ancestor-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -14,7 +14,7 @@
       "transform": 2
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV id='squashed')",
+      "name": "LayoutNGBlockFlow (positioned) DIV id='squashed'",
       "position": [-150, 0],
       "bounds": [300, 300],
       "transform": 2

third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-simple-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-simple-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-simple-expected.txt
index 06772e7..7ac28424 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-simple-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-simple-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -14,11 +14,11 @@
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV class='box middle')",
-      "position": [-120, -120],
+      "name": "LayoutNGBlockFlow (positioned) DIV class='box middle'",
+      "position": [30, 30],
       "bounds": [195, 195],
-      "backgroundColor": "#00FFFF",
-      "transform": 1
+      "contentsOpaqueForText": true,
+      "backgroundColor": "#00FFFF"
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-three-layers-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-three-layers-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-three-layers-expected.txt
index b2614d7..cbd550e 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-three-layers-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-three-layers-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -14,10 +14,10 @@
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV class='box middle')",
-      "position": [-90, -90],
+      "name": "LayoutNGBlockFlow (positioned) DIV class='box middle'",
+      "position": [60, 60],
       "bounds": [270, 285],
-      "transform": 1
+      "contentsOpaqueForText": true
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-transform-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-transform-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-transform-expected.txt
index 0c04e63..a67f4d0a 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-transform-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-transform-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -14,10 +14,9 @@
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV class='box middle')",
-      "position": [-152, -152],
-      "bounds": [227, 227],
-      "transform": 1
+      "name": "LayoutNGBlockFlow (positioned) DIV class='box middle'",
+      "bounds": [225, 225],
+      "contentsOpaqueForText": true
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-transform-repainting-child-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-transform-repainting-child-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-transform-repainting-child-expected.txt
index 405368d..e5d0ae8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-transform-repainting-child-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-transform-repainting-child-expected.txt
@@ -2,7 +2,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -15,10 +15,9 @@
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV class='box middle')",
-      "position": [-152, -152],
-      "bounds": [227, 227],
-      "transform": 1
+      "name": "LayoutNGBlockFlow (positioned) DIV class='box middle'",
+      "bounds": [225, 225],
+      "contentsOpaqueForText": true
     }
   ],
   "transforms": [
@@ -38,7 +37,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -51,13 +50,12 @@
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV class='box middle')",
-      "position": [-152, -152],
-      "bounds": [227, 227],
+      "name": "LayoutNGBlockFlow (positioned) DIV class='box middle'",
+      "bounds": [225, 225],
+      "contentsOpaqueForText": true,
       "invalidations": [
-        [0, 0, 214, 214]
-      ],
-      "transform": 1
+        [0, 0, 212, 212]
+      ]
     }
   ],
   "transforms": [
@@ -77,7 +75,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -90,13 +88,12 @@
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV class='box middle')",
-      "position": [-152, -152],
-      "bounds": [227, 227],
+      "name": "LayoutNGBlockFlow (positioned) DIV class='box middle'",
+      "bounds": [225, 225],
+      "contentsOpaqueForText": true,
       "invalidations": [
-        [0, 0, 214, 214]
-      ],
-      "transform": 1
+        [0, 0, 212, 212]
+      ]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-transform-repainting-transformed-child-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-transform-repainting-transformed-child-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-transform-repainting-transformed-child-expected.txt
index 5aa4e4e..02feef0 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-transform-repainting-transformed-child-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-transform-repainting-transformed-child-expected.txt
@@ -2,7 +2,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -15,10 +15,10 @@
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV class='box middle')",
-      "position": [-143, -143],
+      "name": "LayoutNGBlockFlow (positioned) DIV class='box middle'",
+      "position": [7, 7],
       "bounds": [218, 218],
-      "transform": 1
+      "contentsOpaqueForText": true
     }
   ],
   "transforms": [
@@ -38,7 +38,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -51,13 +51,13 @@
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV class='box middle')",
-      "position": [-143, -143],
+      "name": "LayoutNGBlockFlow (positioned) DIV class='box middle'",
+      "position": [7, 7],
       "bounds": [218, 218],
+      "contentsOpaqueForText": true,
       "invalidations": [
         [0, 0, 196, 196]
-      ],
-      "transform": 1
+      ]
     }
   ],
   "transforms": [
@@ -77,7 +77,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -90,13 +90,13 @@
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV class='box middle')",
-      "position": [-143, -143],
+      "name": "LayoutNGBlockFlow (positioned) DIV class='box middle'",
+      "position": [7, 7],
       "bounds": [218, 218],
+      "contentsOpaqueForText": true,
       "invalidations": [
         [68, 68, 150, 150]
-      ],
-      "transform": 1
+      ]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squashed-layer-loses-graphicslayer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squashed-layer-loses-graphicslayer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squashed-layer-loses-graphicslayer-expected.txt
index d626ed3..25ba394 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squashed-layer-loses-graphicslayer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squashed-layer-loses-graphicslayer-expected.txt
@@ -4,7 +4,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -17,11 +17,11 @@
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV id='A' class='overlap1')",
-      "position": [120, 120],
+      "name": "LayoutNGBlockFlow (positioned) DIV id='A' class='overlap1'",
+      "position": [210, 210],
       "bounds": [210, 210],
-      "backgroundColor": "#FF00FF",
-      "transform": 1
+      "contentsOpaqueForText": true,
+      "backgroundColor": "#FF00FF"
     }
   ],
   "transforms": [
@@ -41,7 +41,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squashed-repaints-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squashed-repaints-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squashed-repaints-expected.txt
index eae6d19..186c2aa 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squashed-repaints-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squashed-repaints-expected.txt
@@ -4,7 +4,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -17,11 +17,11 @@
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV id='A' class='overlap1')",
-      "position": [120, 120],
+      "name": "LayoutNGBlockFlow (positioned) DIV id='A' class='overlap1'",
+      "position": [210, 210],
       "bounds": [210, 210],
-      "backgroundColor": "#FF00FF",
-      "transform": 1
+      "contentsOpaqueForText": true,
+      "backgroundColor": "#FF00FF"
     }
   ],
   "transforms": [
@@ -41,7 +41,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -54,14 +54,14 @@
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV id='A' class='overlap1')",
-      "position": [120, 120],
+      "name": "LayoutNGBlockFlow (positioned) DIV id='A' class='overlap1'",
+      "position": [210, 210],
       "bounds": [210, 210],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#FF00FF",
       "invalidations": [
         [0, 0, 150, 150]
-      ],
-      "transform": 1
+      ]
     }
   ],
   "transforms": [
@@ -81,7 +81,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -94,15 +94,15 @@
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV id='A' class='overlap1')",
-      "position": [120, 120],
+      "name": "LayoutNGBlockFlow (positioned) DIV id='A' class='overlap1'",
+      "position": [210, 210],
       "bounds": [210, 210],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#FF00FF",
       "invalidations": [
         [30, 30, 150, 150],
         [0, 0, 150, 150]
-      ],
-      "transform": 1
+      ]
     }
   ],
   "transforms": [
@@ -122,7 +122,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -135,15 +135,15 @@
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV id='A' class='overlap1')",
-      "position": [120, 120],
+      "name": "LayoutNGBlockFlow (positioned) DIV id='A' class='overlap1'",
+      "position": [210, 210],
       "bounds": [210, 210],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#008000",
       "invalidations": [
         [60, 60, 150, 150],
         [30, 30, 150, 150]
-      ],
-      "transform": 1
+      ]
     }
   ],
   "transforms": [
@@ -163,7 +163,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -176,15 +176,15 @@
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV id='A' class='overlap1')",
-      "position": [120, 120],
+      "name": "LayoutNGBlockFlow (positioned) DIV id='A' class='overlap1'",
+      "position": [210, 210],
       "bounds": [210, 210],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#0000FF",
       "invalidations": [
         [60, 60, 150, 150],
         [0, 0, 150, 150]
-      ],
-      "transform": 1
+      ]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squashing-inside-perspective-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squashing-inside-perspective-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squashing-inside-perspective-expected.txt
index 0527e68..378e789 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squashing-inside-perspective-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squashing-inside-perspective-expected.txt
@@ -1,19 +1,13 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV",
-      "position": [12, 12],
-      "contentsOpaque": true,
-      "drawsContent": false
-    },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV",
       "bounds": [300, 300],
       "contentsOpaque": true,
       "backgroundColor": "#00008B",
@@ -26,10 +20,9 @@
       "transform": [
         [1, 0, 0, 0],
         [0, 1, 0, 0],
-        [0, 0, 1, -0.000666666666666666],
-        [0, 0, 0, 1]
-      ],
-      "origin": [12, 12]
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
     },
     {
       "id": 2,
@@ -37,10 +30,10 @@
       "transform": [
         [1, 0, 0, 0],
         [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [12, 12, 0, 1]
+        [0, 0, 1, -0.000666666666666666],
+        [0, 0, 0, 1]
       ],
-      "flattenInheritedTransform": false
+      "origin": [0, 0]
     },
     {
       "id": 3,

third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squashing-sparsity-heuristic-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squashing-sparsity-heuristic-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squashing-sparsity-heuristic-expected.txt
index 8d63f55..09284701 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squashing-sparsity-heuristic-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squashing-sparsity-heuristic-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -14,23 +14,16 @@
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV id='A' class='overlap1')",
-      "position": [120, 120],
+      "name": "LayoutNGBlockFlow (positioned) DIV id='A' class='overlap1'",
+      "position": [210, 210],
       "bounds": [45, 45],
-      "transform": 1
+      "contentsOpaqueForText": true
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='C' class='overlap3'",
       "position": [330, 450],
-      "bounds": [15, 15],
-      "contentsOpaque": true,
-      "backgroundColor": "#008000"
-    },
-    {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV id='D' class='overlap4')",
-      "position": [352, 450],
-      "bounds": [16, 15],
-      "backgroundColor": "#FFFF00"
+      "bounds": [38, 15],
+      "contentsOpaqueForText": true
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/video/video-controls-layer-creation-squashing-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/video/video-controls-layer-creation-squashing-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/video/video-controls-layer-creation-squashing-expected.txt
index ffb2cf6..ca4345d 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/video/video-controls-layer-creation-squashing-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/video/video-controls-layer-creation-squashing-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -16,11 +16,6 @@
     {
       "name": "LayoutVideo (positioned) VIDEO",
       "bounds": [408, 230],
-      "drawsContent": false
-    },
-    {
-      "name": "LayoutNGFlexibleBox DIV class='use-default-poster sizing-small test-mode phase-pre-ready state-no-source'",
-      "bounds": [408, 230],
       "contentsOpaque": true,
       "backgroundColor": "#333333"
     }

third_party/blink/web_tests/flag-specific/highdpi/compositing/video/video-poster-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/video/video-poster-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/video/video-poster-expected.txt
index ab793e6..f867ea2 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/video/video-poster-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/video/video-poster-expected.txt
@@ -5,7 +5,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -18,7 +18,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -31,7 +31,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 1160],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -39,24 +39,18 @@
     {
       "name": "LayoutVideo VIDEO",
       "bounds": [528, 432],
-      "drawsContent": false,
-      "transform": 1
-    },
-    {
-      "name": "ContentsLayer for LayoutVideo VIDEO",
-      "bounds": [528, 432],
       "transform": 1
     },
     {
       "name": "LayoutNGFlexibleBox DIV class='sizing-small phase-pre-ready state-no-source'",
       "bounds": [528, 432],
+      "contentsOpaqueForText": true,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/visibility/layer-visible-content-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/visibility/layer-visible-content-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/visibility/layer-visible-content-expected.txt
index b418b55..95b9450 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/visibility/layer-visible-content-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/visibility/layer-visible-content-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,11 +9,13 @@
     {
       "name": "LayoutNGBlockFlow DIV class='composited box'",
       "bounds": [15, 15],
+      "contentsOpaqueForText": true,
       "drawsContent": false
     },
     {
       "name": "LayoutNGBlockFlow PRE id='layer-tree'",
-      "bounds": [1200, 24]
+      "bounds": [1200, 24],
+      "drawsContent": false
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/compositing/visibility/visibility-image-layers-dynamic-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/visibility/visibility-image-layers-dynamic-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/visibility/visibility-image-layers-dynamic-expected.txt
index 8192846..efc06bd 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/visibility/visibility-image-layers-dynamic-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/visibility/visibility-image-layers-dynamic-expected.txt
@@ -2,7 +2,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 939],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -10,26 +10,20 @@
     {
       "name": "LayoutNGBlockFlow DIV class='composited container'",
       "bounds": [1124, 216],
+      "contentsOpaqueForText": true,
       "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "LayoutNGBlockFlow DIV class='composited hidden container'",
-      "position": [-6, -6],
-      "bounds": [1136, 228],
-      "drawsContent": false,
-      "transform": 2
-    },
-    {
       "name": "LayoutImage IMG class='visible composited box'",
       "bounds": [150, 150],
+      "contentsOpaqueForText": true,
       "transform": 3
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [
@@ -68,39 +62,34 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
-      "bounds": [1178, 2376],
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 2244],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow DIV class='composited container'",
       "bounds": [1124, 216],
+      "contentsOpaqueForText": true,
       "drawsContent": false,
       "transform": 1
     },
     {
       "name": "LayoutImage IMG class='hidden composited box'",
       "bounds": [150, 150],
+      "contentsOpaqueForText": true,
       "transform": 2
     },
     {
-      "name": "LayoutNGBlockFlow DIV class='composited hidden container'",
-      "position": [-6, -6],
-      "bounds": [1136, 228],
-      "drawsContent": false,
-      "transform": 3
-    },
-    {
       "name": "LayoutImage IMG class='visible composited box'",
       "bounds": [150, 150],
+      "contentsOpaqueForText": true,
       "transform": 4
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [
@@ -149,50 +138,47 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
-      "bounds": [1178, 4144],
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 3902],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow DIV class='composited container'",
       "bounds": [1124, 216],
+      "contentsOpaqueForText": true,
       "drawsContent": false,
       "transform": 1
     },
     {
       "name": "LayoutImage IMG class='hidden composited box'",
       "bounds": [150, 150],
+      "contentsOpaqueForText": true,
       "transform": 2
     },
     {
       "name": "LayoutNGBlockFlow DIV class='composited hidden container'",
       "position": [-6, -6],
       "bounds": [1136, 228],
+      "contentsOpaqueForText": true,
       "transform": 3
     },
     {
       "name": "LayoutImage IMG class='composited box'",
       "bounds": [150, 150],
+      "contentsOpaqueForText": true,
       "transform": 4
     },
     {
-      "name": "LayoutNGBlockFlow DIV class='composited hidden container'",
-      "position": [-6, -6],
-      "bounds": [1136, 228],
-      "drawsContent": false,
-      "transform": 5
-    },
-    {
       "name": "LayoutImage IMG class='visible composited box'",
       "bounds": [150, 150],
+      "contentsOpaqueForText": true,
       "transform": 6
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/compositing/visibility/visibility-image-layers-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/visibility/visibility-image-layers-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/visibility/visibility-image-layers-expected.png
index ddfeed8a..0c50d9c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/visibility/visibility-image-layers-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/visibility/visibility-image-layers-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/compositing/will-change/composited-layers-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/will-change/composited-layers-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/will-change/composited-layers-expected.txt
index 6a6524b..d811d57e 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/will-change/composited-layers-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/will-change/composited-layers-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/compositing/will-change/will-change-contents-suppresses-compositing-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/compositing/will-change/will-change-contents-suppresses-compositing-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/will-change/will-change-contents-suppresses-compositing-expected.txt
index 7f87abd0..36ece76f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/compositing/will-change/will-change-contents-suppresses-compositing-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/compositing/will-change/will-change-contents-suppresses-compositing-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c414-flt-wrap-01-d-g-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c414-flt-wrap-01-d-g-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c414-flt-wrap-01-d-g-expected.png
index a80ef9c..5b14206 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c414-flt-wrap-01-d-g-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c414-flt-wrap-01-d-g-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-default-value-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-default-value-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-default-value-expected.png
index eff1cf85..d66e9a8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-default-value-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-default-value-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-different-image-formats-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-different-image-formats-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-different-image-formats-expected.png
index 21754d9..991ffe8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-different-image-formats-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-different-image-formats-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-gif-color-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-gif-color-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-gif-color-expected.png
index 1278c2d..00ec6276 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-gif-color-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-gif-color-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-image-color-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-image-color-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-image-color-expected.png
index cec09fc6..55f8315 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-image-color-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-image-color-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-image-image-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-image-image-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-image-image-expected.png
index d45adc5..46f1008 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-image-image-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-image-image-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-image-svg-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-image-svg-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-image-svg-expected.png
index a5ac1ab..383add9 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-image-svg-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-image-svg-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-opaque-layer-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-opaque-layer-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-opaque-layer-expected.png
index f2f2e1e..fe9d590f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-opaque-layer-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-opaque-layer-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-separate-layer-declaration-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-separate-layer-declaration-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-separate-layer-declaration-expected.png
index b168402..8a55da3 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-separate-layer-declaration-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-separate-layer-declaration-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-single-layer-no-blending-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-single-layer-no-blending-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-single-layer-no-blending-expected.png
index 26ef680..8fd0eaa 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-single-layer-no-blending-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-single-layer-no-blending-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/css3/blending/effect-background-blend-mode-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/effect-background-blend-mode-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/effect-background-blend-mode-expected.png
index 99703db..4a6e8af 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/effect-background-blend-mode-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/effect-background-blend-mode-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/css3/blending/effect-background-blend-mode-stacking-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/effect-background-blend-mode-stacking-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/effect-background-blend-mode-stacking-expected.png
index 4d30bca7..fd4a48b4 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/effect-background-blend-mode-stacking-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/effect-background-blend-mode-stacking-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-2nd-stacking-context-composited-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-2nd-stacking-context-composited-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-2nd-stacking-context-composited-expected.txt
index eb0ff6a..d40eceb 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-2nd-stacking-context-composited-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-2nd-stacking-context-composited-expected.txt
@@ -1,19 +1,22 @@
 {
   "layers": [
     {
-      "name": "LayoutNGBlockFlow HTML",
-      "bounds": [1200, 900]
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='accelerated stacking-context'",
+      "name": "LayoutNGBlockFlow (positioned) DIV class='stacking-context'",
       "bounds": [240, 135],
-      "contentsOpaque": true,
+      "contentsOpaqueForText": true,
       "backgroundColor": "#008000",
       "transform": 1
     },
     {
-      "name": "LayoutNGBlockFlow HTML (foreground) Layer",
-      "bounds": [1200, 900]
+      "name": "LayoutNGBlockFlow HTML",
+      "position": [12, 12],
+      "bounds": [1176, 869]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-composited-layers-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-composited-layers-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-composited-layers-expected.txt
index c1766af8..146a320e 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-composited-layers-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-composited-layers-expected.txt
@@ -1,14 +1,21 @@
 {
   "layers": [
     {
-      "name": "LayoutNGBlockFlow HTML",
-      "bounds": [1200, 103]
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900]
     },
     {
       "name": "LayoutNGBlockFlow DIV",
+      "position": [12, 27],
       "bounds": [15, 15],
-      "backgroundColor": "#0000FF",
-      "transform": 1
+      "contentsOpaque": true,
+      "backgroundColor": "#0000FF"
     },
     {
       "name": "LayoutNGBlockFlow DIV",

third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-composited-reason-children-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-composited-reason-children-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-composited-reason-children-expected.txt
index 6b01a9ae3..9f63759b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-composited-reason-children-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-composited-reason-children-expected.txt
@@ -1,14 +1,10 @@
 {
   "layers": [
     {
-      "name": "LayoutNGBlockFlow HTML",
-      "bounds": [1200, 900]
-    },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='stacking-context'",
-      "position": [12, 12],
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
       "contentsOpaque": true,
-      "drawsContent": false
+      "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='stacking-context'",
@@ -19,23 +15,21 @@
     },
     {
       "name": "LayoutNGBlockFlow DIV class='blended'",
+      "position": [12, 12],
       "bounds": [240, 135],
-      "backgroundColor": "#0000FF",
-      "transform": 1
+      "contentsOpaque": true,
+      "backgroundColor": "#0000FF"
     },
     {
       "name": "LayoutImage IMG class='accelerated'",
       "bounds": [240, 135],
+      "contentsOpaqueForText": true,
       "transform": 1
     },
     {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='stacking-context' (foreground) Layer",
+      "name": "LayoutNGBlockFlow HTML",
       "position": [12, 12],
-      "drawsContent": false
-    },
-    {
-      "name": "LayoutNGBlockFlow HTML (foreground) Layer",
-      "bounds": [1200, 900]
+      "bounds": [1176, 869]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-isolation-2-stacking-contexts-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-isolation-2-stacking-contexts-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-isolation-2-stacking-contexts-expected.txt
index 1e7d867a..0d61aee 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-isolation-2-stacking-contexts-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-isolation-2-stacking-contexts-expected.txt
@@ -1,14 +1,10 @@
 {
   "layers": [
     {
-      "name": "LayoutNGBlockFlow HTML",
-      "bounds": [1200, 900]
-    },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='stacking-context'",
-      "position": [12, 12],
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
       "contentsOpaque": true,
-      "drawsContent": false
+      "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='stacking-context'",
@@ -20,20 +16,10 @@
     {
       "name": "LayoutImage IMG class='accelerated blended'",
       "bounds": [240, 135],
+      "contentsOpaqueForText": true,
       "transform": 1
     },
     {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='stacking-context' (foreground) Layer",
-      "position": [12, 12],
-      "drawsContent": false
-    },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='accelerated stacking-context'",
-      "contentsOpaque": true,
-      "drawsContent": false,
-      "transform": 2
-    },
-    {
       "name": "LayoutNGBlockFlow (positioned) DIV class='stacking-context'",
       "bounds": [240, 135],
       "contentsOpaque": true,
@@ -43,16 +29,13 @@
     {
       "name": "LayoutImage IMG class='accelerated blended'",
       "bounds": [240, 135],
+      "contentsOpaqueForText": true,
       "transform": 2
     },
     {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='accelerated stacking-context' (foreground) Layer",
-      "drawsContent": false,
-      "transform": 2
-    },
-    {
-      "name": "LayoutNGBlockFlow HTML (foreground) Layer",
-      "bounds": [1200, 900]
+      "name": "LayoutNGBlockFlow HTML",
+      "position": [12, 12],
+      "bounds": [1176, 869]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-isolation-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-isolation-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-isolation-layer-expected.txt
index b3e993b6..6460f6f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-isolation-layer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-isolation-layer-expected.txt
@@ -1,8 +1,10 @@
 {
   "layers": [
     {
-      "name": "LayoutNGBlockFlow HTML",
-      "bounds": [1200, 900]
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='stacking-context'",
@@ -14,11 +16,13 @@
     {
       "name": "LayoutImage IMG class='accelerated blended'",
       "bounds": [240, 135],
+      "contentsOpaqueForText": true,
       "transform": 1
     },
     {
-      "name": "LayoutNGBlockFlow HTML (foreground) Layer",
-      "bounds": [1200, 900]
+      "name": "LayoutNGBlockFlow HTML",
+      "position": [12, 12],
+      "bounds": [1176, 869]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-isolation-remove-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-isolation-remove-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-isolation-remove-expected.txt
index 90852b1..e46ecabd 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-isolation-remove-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-isolation-remove-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -24,6 +24,7 @@
     {
       "name": "LayoutImage IMG class='accelerated blended'",
       "bounds": [240, 135],
+      "contentsOpaqueForText": true,
       "transform": 1
     }
   ],

third_party/blink/web_tests/flag-specific/highdpi/css3/calc/calc-numbers-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/css3/calc/calc-numbers-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/css3/calc/calc-numbers-expected.txt
index 1e0a2f7..67407b5 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/css3/calc/calc-numbers-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/css3/calc/calc-numbers-expected.txt
@@ -1,7 +1,7 @@
 PASS getComputedValue(".int", "tabSize") is "8"
-PASS getComputedValue(".int-non-neg-invalid", "tabSize") is "12345"
+PASS getComputedValue(".int-non-neg-clamp", "tabSize") is "0"
 PASS Number(getComputedValue(".float", "opacity")) is within 0.0001 of 0.5
-PASS getComputedValue(".float-to-rounded-int", "zIndex") is "1"
+PASS getComputedValue(".float-round", "zIndex") is "1"
 PASS Number(getComputedValue(".px-invalid", "opacity")) is within 0.0001 of 0.9
 PASS getComputedValue(".num-length-invalid", "tabSize") is "12345"
 FAIL getComputedValue(".px-valid", "tabSize") should be 10px. Was 15px.

third_party/blink/web_tests/flag-specific/highdpi/css3/filters/backdrop-filter-browser-zoom-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/backdrop-filter-browser-zoom-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/backdrop-filter-browser-zoom-expected.png
index 77011920..2c80988 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/backdrop-filter-browser-zoom-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/backdrop-filter-browser-zoom-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/css3/filters/blur-filter-page-scroll-self-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/blur-filter-page-scroll-self-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/blur-filter-page-scroll-self-expected.png
index b1ddb30..31b9b19 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/blur-filter-page-scroll-self-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/blur-filter-page-scroll-self-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/css3/filters/composited-during-transition-layertree-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/composited-during-transition-layertree-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/composited-during-transition-layertree-expected.txt
index 37b1339..0fe470d 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/composited-during-transition-layertree-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/composited-during-transition-layertree-expected.txt
@@ -5,7 +5,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -13,22 +13,50 @@
     {
       "name": "LayoutImage IMG id='grayscale-box'",
       "bounds": [240, 135],
+      "contentsOpaqueForText": true,
       "transform": 1
     },
     {
+      "name": "LayoutImage IMG id='sepia-box'",
+      "position": [303, 27],
+      "bounds": [240, 135],
+      "contentsOpaqueForText": true
+    },
+    {
       "name": "LayoutImage IMG id='saturate-box'",
       "bounds": [240, 135],
+      "contentsOpaqueForText": true,
       "transform": 2
     },
     {
+      "name": "LayoutImage IMG id='huerotate-box'",
+      "position": [303, 198],
+      "bounds": [240, 135],
+      "contentsOpaqueForText": true
+    },
+    {
       "name": "LayoutImage IMG id='invert-box'",
       "bounds": [240, 135],
+      "contentsOpaqueForText": true,
       "transform": 3
     },
     {
+      "name": "LayoutImage IMG id='opacity-box'",
+      "position": [303, 369],
+      "bounds": [240, 135],
+      "contentsOpaqueForText": true
+    },
+    {
       "name": "LayoutImage IMG id='brightness-box'",
       "bounds": [240, 135],
+      "contentsOpaqueForText": true,
       "transform": 4
+    },
+    {
+      "name": "LayoutImage IMG id='contrast-box'",
+      "position": [303, 540],
+      "bounds": [240, 135],
+      "contentsOpaqueForText": true
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/css3/filters/composited-layer-bounds-with-composited-blur-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/composited-layer-bounds-with-composited-blur-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/composited-layer-bounds-with-composited-blur-expected.txt
index ee74a2f..69362978 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/composited-layer-bounds-with-composited-blur-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/composited-layer-bounds-with-composited-blur-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-blur-hw-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-blur-hw-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-blur-hw-expected.png
index 58165af..0f92e6c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-blur-hw-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-blur-hw-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-drop-shadow-hw-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-drop-shadow-hw-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-drop-shadow-hw-expected.png
index edd69f5..7583a54 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-drop-shadow-hw-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-drop-shadow-hw-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-reference-subregion-chained-hw-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-reference-subregion-chained-hw-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-reference-subregion-chained-hw-expected.png
index 8947a1b8..3144fa8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-reference-subregion-chained-hw-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-reference-subregion-chained-hw-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/css3/filters/filtered-compositing-descendant-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/filtered-compositing-descendant-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/filtered-compositing-descendant-expected.txt
index 25b359ec..a204fc1 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/filtered-compositing-descendant-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/filtered-compositing-descendant-expected.txt
@@ -1,22 +1,23 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow DIV class='filtered box'",
+      "position": [12, 12],
       "bounds": [216, 216],
-      "transform": 1
+      "contentsOpaqueForText": true
     },
     {
       "name": "LayoutNGBlockFlow DIV class='compositing box'",
       "bounds": [150, 150],
       "contentsOpaque": true,
       "backgroundColor": "#FF0000",
-      "transform": 3
+      "transform": 2
     }
   ],
   "transforms": [
@@ -26,7 +27,7 @@
         [1, 0, 0, 0],
         [0, 1, 0, 0],
         [0, 0, 1, 0],
-        [12, 12, 0, 1]
+        [45, 45, 0, 1]
       ]
     },
     {
@@ -36,16 +37,6 @@
         [1, 0, 0, 0],
         [0, 1, 0, 0],
         [0, 0, 1, 0],
-        [33, 33, 0, 1]
-      ]
-    },
-    {
-      "id": 3,
-      "parent": 2,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
         [0, 0, 1.5, 1]
       ]
     }

third_party/blink/web_tests/flag-specific/highdpi/css3/filters/should-not-have-compositing-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/should-not-have-compositing-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/should-not-have-compositing-layer-expected.txt
index 7f87abd0..36ece76f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/should-not-have-compositing-layer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/should-not-have-compositing-layer-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/css3/masking/clip-path-inset-large-radii-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/css3/masking/clip-path-inset-large-radii-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/masking/clip-path-inset-large-radii-expected.png
index 0a3c3cf..7f0b1a6 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/css3/masking/clip-path-inset-large-radii-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/css3/masking/clip-path-inset-large-radii-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/editing/caret/caret-color-001-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/editing/caret/caret-color-001-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/editing/caret/caret-color-001-expected.png
index 0c76710..6fed4f9 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/editing/caret/caret-color-001-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/editing/caret/caret-color-001-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/editing/caret/caret-color-002-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/editing/caret/caret-color-002-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/editing/caret/caret-color-002-expected.png
index 0c76710..6fed4f9 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/editing/caret/caret-color-002-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/editing/caret/caret-color-002-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/editing/caret/caret-color-003-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/editing/caret/caret-color-003-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/editing/caret/caret-color-003-expected.png
index ea1d43f..7120cd7 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/editing/caret/caret-color-003-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/editing/caret/caret-color-003-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/editing/caret/caret-color-004-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/editing/caret/caret-color-004-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/editing/caret/caret-color-004-expected.png
index b4df975..87a76fe 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/editing/caret/caret-color-004-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/editing/caret/caret-color-004-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/editing/caret/caret-color-005-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/editing/caret/caret-color-005-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/editing/caret/caret-color-005-expected.png
index c7717eb..461ce68 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/editing/caret/caret-color-005-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/editing/caret/caret-color-005-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/editing/caret/caret-color-007-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/editing/caret/caret-color-007-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/editing/caret/caret-color-007-expected.png
index 8c7b3d4..00ad7ec 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/editing/caret/caret-color-007-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/editing/caret/caret-color-007-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/editing/caret/caret-color-012-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/editing/caret/caret-color-012-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/editing/caret/caret-color-012-expected.png
index 0c76710..6fed4f9 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/editing/caret/caret-color-012-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/editing/caret/caret-color-012-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/editing/input/reveal-caret-of-multiline-input-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/editing/input/reveal-caret-of-multiline-input-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/editing/input/reveal-caret-of-multiline-input-expected.png
index a40f5fd..2fec4b1 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/editing/input/reveal-caret-of-multiline-input-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/editing/input/reveal-caret-of-multiline-input-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/editing/inserting/4960120-1-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/editing/inserting/4960120-1-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/editing/inserting/4960120-1-expected.png
index f29373f85..248abb2 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/editing/inserting/4960120-1-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/editing/inserting/4960120-1-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/editing/selection/line-wrap-2-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/editing/selection/line-wrap-2-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/editing/selection/line-wrap-2-expected.png
index dbb981e..c5f1455e 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/editing/selection/line-wrap-2-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/editing/selection/line-wrap-2-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/backgrounds/gradient-background-leakage-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/backgrounds/gradient-background-leakage-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/backgrounds/gradient-background-leakage-expected.png
index bb55565f..6092bf1 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/backgrounds/gradient-background-leakage-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/backgrounds/gradient-background-leakage-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/backgrounds/repeat/negative-offset-repeat-transformed-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/backgrounds/repeat/negative-offset-repeat-transformed-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/backgrounds/repeat/negative-offset-repeat-transformed-expected.png
index 0f9df18..936dd220 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/backgrounds/repeat/negative-offset-repeat-transformed-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/backgrounds/repeat/negative-offset-repeat-transformed-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-image-massive-scale-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-image-massive-scale-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-image-massive-scale-expected.png
index 8c0a437..09eb701 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-image-massive-scale-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-image-massive-scale-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-image-rotate-transform-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-image-rotate-transform-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-image-rotate-transform-expected.png
index b5ed2ed..c18c7c9 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-image-rotate-transform-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-image-rotate-transform-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-radius-background-constrained-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-radius-background-constrained-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-radius-background-constrained-expected.png
index f7311660..ce90103 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-radius-background-constrained-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-radius-background-constrained-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-radius-constraints-double-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-radius-constraints-double-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-radius-constraints-double-expected.png
index ead1706..0b7f3b33 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-radius-constraints-double-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-radius-constraints-double-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-radius-constraints-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-radius-constraints-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-radius-constraints-expected.png
index bbf9bec..eb4218b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-radius-constraints-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-radius-constraints-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-radius-groove-03-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-radius-groove-03-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-radius-groove-03-expected.png
index 3865e9a..aeed3cbe 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-radius-groove-03-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-radius-groove-03-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-radius-huge-assert-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-radius-huge-assert-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-radius-huge-assert-expected.png
index 516abf94..d7a075d 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-radius-huge-assert-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-radius-huge-assert-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-radius-mask-canvas-border-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-radius-mask-canvas-border-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-radius-mask-canvas-border-expected.png
index ced809e..f279427 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-radius-mask-canvas-border-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-radius-mask-canvas-border-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-radius-percent-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-radius-percent-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-radius-percent-expected.png
index 625b2e1..1ea44773 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-radius-percent-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-radius-percent-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-radius-with-box-shadow-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-radius-with-box-shadow-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-radius-with-box-shadow-expected.png
index a2214267..d2e5be6 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-radius-with-box-shadow-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-radius-with-box-shadow-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-radius-with-empty-inner-border-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-radius-with-empty-inner-border-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-radius-with-empty-inner-border-expected.png
index 2b0a30e..fac2c90d7 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-radius-with-empty-inner-border-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/border-radius-with-empty-inner-border-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/borders/borderRadiusDashed05-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/borderRadiusDashed05-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/borderRadiusDashed05-expected.png
index 38f117e..ed9dfb9 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/borderRadiusDashed05-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/borderRadiusDashed05-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/borders/mixed-border-styles-radius-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/mixed-border-styles-radius-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/mixed-border-styles-radius-expected.png
index 9ae301b8..9ef29bd 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/mixed-border-styles-radius-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/mixed-border-styles-radius-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/borders/overflow-hidden-border-radius-force-backing-store-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/overflow-hidden-border-radius-force-backing-store-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/overflow-hidden-border-radius-force-backing-store-expected.txt
index 6c777a7f..0b9a4d2 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/overflow-hidden-border-radius-force-backing-store-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/overflow-hidden-border-radius-force-backing-store-expected.txt
@@ -1,18 +1,19 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow DIV id='inner'",
-      "bounds": [450, 450],
+      "bounds": [428, 450],
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [428, 0],
       "bounds": [22, 450],
       "transform": 1

third_party/blink/web_tests/flag-specific/highdpi/fast/borders/short-border-plus-large-rounded-radii-bleed-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/short-border-plus-large-rounded-radii-bleed-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/short-border-plus-large-rounded-radii-bleed-expected.png
index 8bde8732..89021cb 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/short-border-plus-large-rounded-radii-bleed-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/borders/short-border-plus-large-rounded-radii-bleed-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/box-shadow/inset-with-extraordinary-radii-and-border-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/box-shadow/inset-with-extraordinary-radii-and-border-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/box-shadow/inset-with-extraordinary-radii-and-border-expected.png
index afbc8b50..febd8061 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/box-shadow/inset-with-extraordinary-radii-and-border-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/box-shadow/inset-with-extraordinary-radii-and-border-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/box-shadow/spread-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/box-shadow/spread-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/box-shadow/spread-expected.png
index ef0c249..804297ff 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/box-shadow/spread-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/box-shadow/spread-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/css-grid-layout/grid-auto-repeat-huge-grid-002-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/css-grid-layout/grid-auto-repeat-huge-grid-002-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/fast/css-grid-layout/grid-auto-repeat-huge-grid-002-expected.txt
new file mode 100644
index 0000000..e573bd17
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/css-grid-layout/grid-auto-repeat-huge-grid-002-expected.txt
@@ -0,0 +1,5 @@
+This is a testharness.js-based test.
+FAIL Test that we don't get more than kGridMaxTracks repetitions even on very wide grids with gaps. assert_equals: expected 30 but got 20
+FAIL Test that we don't get more than kGridMaxTracks repetitions even on very tall grids with gaps. assert_equals: expected 30 but got 20
+Harness: the test ran to completion.
+

third_party/blink/web_tests/flag-specific/highdpi/fast/css-grid-layout/grid-auto-repeat-huge-grid-004-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/css-grid-layout/grid-auto-repeat-huge-grid-004-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/fast/css-grid-layout/grid-auto-repeat-huge-grid-004-expected.txt
new file mode 100644
index 0000000..1ad0baa8
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/css-grid-layout/grid-auto-repeat-huge-grid-004-expected.txt
@@ -0,0 +1,5 @@
+This is a testharness.js-based test.
+FAIL Test that we don't get more than kGridMaxTracks repetitions even on very wide grids with gaps and min-width. assert_equals: expected "20px" but got "19.9896px"
+FAIL Test that we don't get more than kGridMaxTracks repetitions even on very tall grids with gaps and min-height. assert_equals: expected "20px" but got "19.9896px"
+Harness: the test ran to completion.
+

third_party/blink/web_tests/flag-specific/highdpi/fast/css/background-clip-radius-values-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/css/background-clip-radius-values-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/css/background-clip-radius-values-expected.png
index 03e8f63..836db2fa 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/css/background-clip-radius-values-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/css/background-clip-radius-values-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/css/background-clip-values-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/css/background-clip-values-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/css/background-clip-values-expected.png
index a46bc948..3c9fc18 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/css/background-clip-values-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/css/background-clip-values-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/css/block-focus-ring-with-border-radius-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/css/block-focus-ring-with-border-radius-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/css/block-focus-ring-with-border-radius-expected.png
index 860474b..ed22b1d 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/css/block-focus-ring-with-border-radius-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/css/block-focus-ring-with-border-radius-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/css/getComputedStyle/computed-style-listing-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/css/getComputedStyle/computed-style-listing-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/fast/css/getComputedStyle/computed-style-listing-expected.txt
index 056f6d7..32344b79 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/css/getComputedStyle/computed-style-listing-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/css/getComputedStyle/computed-style-listing-expected.txt
@@ -2,7 +2,6 @@
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
--webkit-app-region: none
 -webkit-border-horizontal-spacing: 0px
 -webkit-border-image: none
 -webkit-border-vertical-spacing: 0px
@@ -64,6 +63,7 @@
 animation-play-state: running
 animation-timeline: auto
 animation-timing-function: ease
+app-region: none
 appearance: none
 backdrop-filter: none
 backface-visibility: visible
@@ -143,6 +143,13 @@
 column-rule-width: 0px
 column-span: none
 column-width: auto
+contain-intrinsic-block-size: none
+contain-intrinsic-height: none
+contain-intrinsic-inline-size: none
+contain-intrinsic-size: none
+contain-intrinsic-width: none
+container-name: none
+container-type: none
 content: normal
 cursor: auto
 cx: 0px
@@ -170,6 +177,9 @@
 font-size-adjust: none
 font-stretch: 100%
 font-style: normal
+font-synthesis-small-caps: auto
+font-synthesis-style: auto
+font-synthesis-weight: auto
 font-variant: normal
 font-variant-caps: normal
 font-variant-east-asian: normal

third_party/blink/web_tests/flag-specific/highdpi/fast/css/inline-focus-ring-with-non-uniform-border-radius-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/css/inline-focus-ring-with-non-uniform-border-radius-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/css/inline-focus-ring-with-non-uniform-border-radius-expected.png
index 5168419..796fbc5 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/css/inline-focus-ring-with-non-uniform-border-radius-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/css/inline-focus-ring-with-non-uniform-border-radius-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/css/inline-outline-with-border-radius-dashed-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/css/inline-outline-with-border-radius-dashed-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/css/inline-outline-with-border-radius-dashed-expected.png
index 50356d3..f3de55b8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/css/inline-outline-with-border-radius-dashed-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/css/inline-outline-with-border-radius-dashed-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/css/inline-outline-with-border-radius-dotted-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/css/inline-outline-with-border-radius-dotted-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/css/inline-outline-with-border-radius-dotted-expected.png
index 65c806e..3a85996 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/css/inline-outline-with-border-radius-dotted-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/css/inline-outline-with-border-radius-dotted-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/css/inline-outline-with-border-radius-double-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/css/inline-outline-with-border-radius-double-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/css/inline-outline-with-border-radius-double-expected.png
index c8e2915..d8a435c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/css/inline-outline-with-border-radius-double-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/css/inline-outline-with-border-radius-double-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/css/inline-outline-with-border-radius-groove-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/css/inline-outline-with-border-radius-groove-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/css/inline-outline-with-border-radius-groove-expected.png
index 073a9051..143c80c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/css/inline-outline-with-border-radius-groove-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/css/inline-outline-with-border-radius-groove-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/css/inline-outline-with-border-radius-inset-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/css/inline-outline-with-border-radius-inset-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/css/inline-outline-with-border-radius-inset-expected.png
index bf7ec34..3e5447d 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/css/inline-outline-with-border-radius-inset-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/css/inline-outline-with-border-radius-inset-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/css/inline-outline-with-border-radius-outset-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/css/inline-outline-with-border-radius-outset-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/css/inline-outline-with-border-radius-outset-expected.png
index c12ae5676..42108e6 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/css/inline-outline-with-border-radius-outset-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/css/inline-outline-with-border-radius-outset-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/css/inline-outline-with-border-radius-ridge-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/css/inline-outline-with-border-radius-ridge-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/css/inline-outline-with-border-radius-ridge-expected.png
index 8fcadc2..a7a38a5 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/css/inline-outline-with-border-radius-ridge-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/css/inline-outline-with-border-radius-ridge-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/css/inline-outline-with-border-radius-solid-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/css/inline-outline-with-border-radius-solid-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/css/inline-outline-with-border-radius-solid-expected.png
index 344464e..88a0b23 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/css/inline-outline-with-border-radius-solid-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/css/inline-outline-with-border-radius-solid-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/css/outline-with-border-radius-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/css/outline-with-border-radius-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/css/outline-with-border-radius-expected.png
index c291a074..788489a 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/css/outline-with-border-radius-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/css/outline-with-border-radius-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/css/transformed-mask-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/css/transformed-mask-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/css/transformed-mask-expected.png
index f89ba5d..f06bb17 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/css/transformed-mask-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/css/transformed-mask-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/events/touch/compositor-touch-hit-rects-global-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/events/touch/compositor-touch-hit-rects-global-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/fast/events/touch/compositor-touch-hit-rects-global-expected.txt
index bbd5a003..1d68e1db 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/events/touch/compositor-touch-hit-rects-global-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/events/touch/compositor-touch-hit-rects-global-expected.txt
@@ -1,6 +1,6 @@
 This tests verifies the hit test regions given to the compositor in the simple case where touch handles cover (or nearly cover) the entire document. It can only be run in DumpRenderTree.
 
-document: layer(1200x900) has hit test rect (0,0 1178x900)
+document: layer(1178x900) has hit test rect (0,0 1178x900)
 document: layer(1178x3000) has hit test rect (0,0 1178x3000)
 
 html: layer(1178x3000) has hit test rect (0,0 1178x3000)

third_party/blink/web_tests/flag-specific/highdpi/fast/events/touch/compositor-touch-hit-rects-iframes-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/events/touch/compositor-touch-hit-rects-iframes-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/fast/events/touch/compositor-touch-hit-rects-iframes-expected.txt
index ec48a5d..531ef1a 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/events/touch/compositor-touch-hit-rects-iframes-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/events/touch/compositor-touch-hit-rects-iframes-expected.txt
@@ -6,9 +6,9 @@
 
 iframe-transform: layer(578x147) has hit test rect (20,50 435x33)
 
-iframe-fixed: layer(498x33) has hit test rect (0,0 498x33)
+iframe-fixed: layer(499x34) has hit test rect (1,1 498x33)
 
-iframe-doc: layer(600x38) has hit test rect (0,0 578x38)
 iframe-doc: layer(578x87) has hit test rect (0,0 578x87)
+iframe-doc: layer(1200x900) has hit test rect (15,426 578x38)
 
 

third_party/blink/web_tests/flag-specific/highdpi/fast/events/touch/compositor-touch-hit-rects-scroll-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/events/touch/compositor-touch-hit-rects-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/fast/events/touch/compositor-touch-hit-rects-scroll-expected.txt
index be017eb..5c1fc1f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/events/touch/compositor-touch-hit-rects-scroll-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/events/touch/compositor-touch-hit-rects-scroll-expected.txt
@@ -1,6 +1,6 @@
 This test verifies the hit test regions given to the compositor specifically around composited overflow scroll elements.
 
-scrollContent: layer(410x113) has hit test rect (0,19 410x18)
+scrollContent: layer(410x112) has hit test rect (0,19 410x18)
 
 scrollContent5: layer(410x127) has hit test rect (0,20 410x18)
 
@@ -9,12 +9,12 @@
 nestedContent: layer(385x108) has hit test rect (0,45 385x18)
 
 overflowwithhandler: layer(385x174) has hit test rect (0,0 385x174)
-overflowwithhandler: layer(410x78) has hit test rect (0,0 410x78)
+overflowwithhandler: layer(410x168) has hit test rect (0,15 410x78)
 
-overflowwithborder: layer(435x105) has hit test rect (0,0 435x105)
-overflowwithborder: layer(395x186) has hit test rect (6,6 383x174)
+overflowwithborder: layer(384x175) has hit test rect (1,1 383x174)
+overflowwithborder: layer(1154x1131) has hit test rect (8,525 435x105)
 
 withTransform: layer(407x18) has hit test rect (0,0 407x18)
-withTransform: layer(423x116) has hit test rect (0,19 410x21)
+withTransform: layer(410x115) has hit test rect (0,19 410x21)
 
 

third_party/blink/web_tests/flag-specific/highdpi/fast/events/touch/compositor-touch-hit-rects-squashing-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/events/touch/compositor-touch-hit-rects-squashing-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/fast/events/touch/compositor-touch-hit-rects-squashing-expected.txt
index afe1af6..9503d9c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/events/touch/compositor-touch-hit-rects-squashing-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/events/touch/compositor-touch-hit-rects-squashing-expected.txt
@@ -2,8 +2,8 @@
 
 behind: layer(78x78) has hit test rect (0,0 78x78)
 
-middle: layer(199x199) has hit test rect (1,1 78x78)
+middle: layer(79x79) has hit test rect (1,1 78x78)
 
-top: layer(199x199) has hit test rect (121,121 78x78)
+top: layer(79x79) has hit test rect (1,1 78x78)
 
 

third_party/blink/web_tests/flag-specific/highdpi/fast/events/touch/compositor-touch-hit-rects-with-negative-child-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/events/touch/compositor-touch-hit-rects-with-negative-child-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/fast/events/touch/compositor-touch-hit-rects-with-negative-child-expected.txt
index 77081ab..48bb0fa0 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/events/touch/compositor-touch-hit-rects-with-negative-child-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/events/touch/compositor-touch-hit-rects-with-negative-child-expected.txt
@@ -1,5 +1,5 @@
 This tests verifies the hit test regions given to the compositor for an element with child at negative offset. It can only be run in DumpRenderTree.
 
-negativeOffsetChild: layer(316x20) has hit test rect (0,2 153x18)
+negativeOffsetChild: layer(317x20) has hit test rect (1,2 153x18)
 
 

third_party/blink/web_tests/flag-specific/highdpi/fast/forms/calendar-picker/calendar-picker-appearance-ar-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/calendar-picker/calendar-picker-appearance-ar-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/calendar-picker/calendar-picker-appearance-ar-expected.png
index e5fa2ae..9437fe8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/calendar-picker/calendar-picker-appearance-ar-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/calendar-picker/calendar-picker-appearance-ar-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/forms/calendar-picker/calendar-picker-appearance-required-ar-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/calendar-picker/calendar-picker-appearance-required-ar-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/calendar-picker/calendar-picker-appearance-required-ar-expected.png
index d0c3664..a67cad6 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/calendar-picker/calendar-picker-appearance-required-ar-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/calendar-picker/calendar-picker-appearance-required-ar-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/forms/calendar-picker/calendar-picker-appearance-ru-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/calendar-picker/calendar-picker-appearance-ru-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/calendar-picker/calendar-picker-appearance-ru-expected.png
index 78ae29a..bf801f18 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/calendar-picker/calendar-picker-appearance-ru-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/calendar-picker/calendar-picker-appearance-ru-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/forms/calendar-picker/date-picker-appearance-rtl-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/calendar-picker/date-picker-appearance-rtl-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/calendar-picker/date-picker-appearance-rtl-expected.png
index e5fa2ae..9437fe8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/calendar-picker/date-picker-appearance-rtl-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/calendar-picker/date-picker-appearance-rtl-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/forms/color-scheme/autofill/autofilled-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/color-scheme/autofill/autofilled-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/color-scheme/autofill/autofilled-expected.png
index 1536719..07107a26 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/color-scheme/autofill/autofilled-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/color-scheme/autofill/autofilled-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/forms/color-scheme/text/input-basic-box-appearance-basic-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/color-scheme/text/input-basic-box-appearance-basic-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/color-scheme/text/input-basic-box-appearance-basic-expected.png
index 3b39acc..cfd398b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/color-scheme/text/input-basic-box-appearance-basic-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/color-scheme/text/input-basic-box-appearance-basic-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/forms/color-scheme/text/input-disabled-state-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/color-scheme/text/input-disabled-state-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/color-scheme/text/input-disabled-state-expected.png
index 0bda85e..1cdcf52 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/color-scheme/text/input-disabled-state-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/color-scheme/text/input-disabled-state-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/forms/color/color-suggestion-picker-appearance-zoom125-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/color/color-suggestion-picker-appearance-zoom125-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/color/color-suggestion-picker-appearance-zoom125-expected.png
index 22b0be4..7c498ba 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/color/color-suggestion-picker-appearance-zoom125-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/color/color-suggestion-picker-appearance-zoom125-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/forms/date/date-appearance-basic-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/date/date-appearance-basic-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/date/date-appearance-basic-expected.png
index 804b8074..7053686 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/date/date-appearance-basic-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/date/date-appearance-basic-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/forms/datetimelocal/datetimelocal-appearance-l10n-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/datetimelocal/datetimelocal-appearance-l10n-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/datetimelocal/datetimelocal-appearance-l10n-expected.png
index f847420b..a72f664 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/datetimelocal/datetimelocal-appearance-l10n-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/datetimelocal/datetimelocal-appearance-l10n-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/forms/focus-rect/textarea-scrolled-focus-ring-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/focus-rect/textarea-scrolled-focus-ring-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/focus-rect/textarea-scrolled-focus-ring-expected.png
index 95372fde..3bfbce7 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/focus-rect/textarea-scrolled-focus-ring-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/focus-rect/textarea-scrolled-focus-ring-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/forms/focus-rect/textarea-with-scrollbar-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/focus-rect/textarea-with-scrollbar-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/focus-rect/textarea-with-scrollbar-expected.png
index aaa0e3d..b8a6dc69 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/focus-rect/textarea-with-scrollbar-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/focus-rect/textarea-with-scrollbar-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/forms/form-element-geometry-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/form-element-geometry-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/form-element-geometry-expected.png
index 8632414..34cd01f1 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/form-element-geometry-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/form-element-geometry-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/forms/month/month-appearance-basic-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/month/month-appearance-basic-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/month/month-appearance-basic-expected.png
index 1da5bff..f932bdac 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/month/month-appearance-basic-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/month/month-appearance-basic-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/forms/month/month-appearance-l10n-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/month/month-appearance-l10n-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/month/month-appearance-l10n-expected.png
index 2de09da..4597f0e 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/month/month-appearance-l10n-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/month/month-appearance-l10n-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/forms/month/month-picker-appearance-rtl-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/month/month-picker-appearance-rtl-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/month/month-picker-appearance-rtl-expected.png
index 53f0289..68eb3c4 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/month/month-picker-appearance-rtl-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/month/month-picker-appearance-rtl-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/forms/negativeLineHeight-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/negativeLineHeight-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/negativeLineHeight-expected.png
index fdd1f32..2ddfa479 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/negativeLineHeight-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/negativeLineHeight-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/forms/placeholder-position-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/placeholder-position-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/placeholder-position-expected.png
index 1926c81..610f7a7 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/placeholder-position-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/placeholder-position-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/forms/select/listbox-appearance-basic-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/select/listbox-appearance-basic-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/select/listbox-appearance-basic-expected.png
index 7c214d5c..a769d408 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/select/listbox-appearance-basic-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/select/listbox-appearance-basic-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/forms/select/optgroup-rendering-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/select/optgroup-rendering-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/select/optgroup-rendering-expected.png
index a6f30c5..e5510c4 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/select/optgroup-rendering-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/select/optgroup-rendering-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/basic-textareas-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/basic-textareas-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/basic-textareas-expected.png
index c8ffe6d..0032a0a7 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/basic-textareas-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/basic-textareas-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/linebox-overflow-in-textarea-padding-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/linebox-overflow-in-textarea-padding-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/linebox-overflow-in-textarea-padding-expected.png
index 6c8a232c..2a149f2e1 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/linebox-overflow-in-textarea-padding-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/linebox-overflow-in-textarea-padding-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/placeholder-appearance-textarea-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/placeholder-appearance-textarea-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/placeholder-appearance-textarea-expected.png
index 2c6ce48..22aae29 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/placeholder-appearance-textarea-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/placeholder-appearance-textarea-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/reset-textarea-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/reset-textarea-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/reset-textarea-expected.png
index 2ab9b8d..4ac55bf 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/reset-textarea-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/reset-textarea-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textAreaLineHeight-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textAreaLineHeight-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textAreaLineHeight-expected.png
index 7cc27c7e..099918ad6 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textAreaLineHeight-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textAreaLineHeight-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textarea-align-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textarea-align-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textarea-align-expected.png
index c428f89..c253e98 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textarea-align-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textarea-align-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textarea-appearance-basic-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textarea-appearance-basic-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textarea-appearance-basic-expected.png
index 397670f0..a5f305a 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textarea-appearance-basic-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textarea-appearance-basic-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textarea-placeholder-visibility-1-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textarea-placeholder-visibility-1-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textarea-placeholder-visibility-1-expected.png
index ecd7180..3b278420 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textarea-placeholder-visibility-1-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textarea-placeholder-visibility-1-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textarea-placeholder-visibility-2-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textarea-placeholder-visibility-2-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textarea-placeholder-visibility-2-expected.png
index 078b7ee..8ed0cbe 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textarea-placeholder-visibility-2-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textarea-placeholder-visibility-2-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textarea-scroll-height-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textarea-scroll-height-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textarea-scroll-height-expected.png
index bfd53da..285cdfe 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textarea-scroll-height-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textarea-scroll-height-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textarea-scrollbar-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textarea-scrollbar-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textarea-scrollbar-expected.png
index 891c43b..6d48940 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textarea-scrollbar-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textarea-scrollbar-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textarea-scrolled-focus-ring-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textarea-scrolled-focus-ring-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textarea-scrolled-focus-ring-expected.png
index 7ccfc064..6b2a773 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textarea-scrolled-focus-ring-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textarea-scrolled-focus-ring-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textarea-setinnerhtml-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textarea-setinnerhtml-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textarea-setinnerhtml-expected.png
index c30deda..a122f9b4 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textarea-setinnerhtml-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textarea-setinnerhtml-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textarea-width-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textarea-width-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textarea-width-expected.png
index c2c1da1..28f64d3c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textarea-width-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/forms/textarea/textarea-width-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/overflow/hit-test-overflow-controls-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/overflow/hit-test-overflow-controls-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/overflow/hit-test-overflow-controls-expected.png
index 036efd4..74a65f05 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/overflow/hit-test-overflow-controls-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/overflow/hit-test-overflow-controls-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/overflow/overflow-update-transform-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/overflow/overflow-update-transform-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/overflow/overflow-update-transform-expected.png
index c074d70..241b291 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/overflow/overflow-update-transform-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/overflow/overflow-update-transform-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/overflow/overflow-with-local-background-attachment-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/overflow/overflow-with-local-background-attachment-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/overflow/overflow-with-local-background-attachment-expected.png
index 18d5d288..4c768be8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/overflow/overflow-with-local-background-attachment-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/overflow/overflow-with-local-background-attachment-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/overflow/overflow-x-y-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/overflow/overflow-x-y-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/overflow/overflow-x-y-expected.png
index 0833edb2..f7a4f90b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/overflow/overflow-x-y-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/overflow/overflow-x-y-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/parser/entity-comment-in-textarea-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/parser/entity-comment-in-textarea-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/parser/entity-comment-in-textarea-expected.png
index d00ab13..33f82ca 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/parser/entity-comment-in-textarea-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/parser/entity-comment-in-textarea-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/parser/open-comment-in-textarea-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/parser/open-comment-in-textarea-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/parser/open-comment-in-textarea-expected.png
index 742bb28..de78bbe 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/parser/open-comment-in-textarea-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/parser/open-comment-in-textarea-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/reflections/transparent-reflected-sublayers-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/reflections/transparent-reflected-sublayers-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/reflections/transparent-reflected-sublayers-expected.png
index b329d9e..f355599 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/reflections/transparent-reflected-sublayers-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/reflections/transparent-reflected-sublayers-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/replaced/width100percent-textarea-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/replaced/width100percent-textarea-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/replaced/width100percent-textarea-expected.png
index dda62a3..9341d1f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/replaced/width100percent-textarea-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/replaced/width100percent-textarea-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/sub-pixel/repaint-subpixel-layer-in-subpixel-composited-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/sub-pixel/repaint-subpixel-layer-in-subpixel-composited-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/fast/sub-pixel/repaint-subpixel-layer-in-subpixel-composited-layer-expected.txt
index d1527e6..4d97c2c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/sub-pixel/repaint-subpixel-layer-in-subpixel-composited-layer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/sub-pixel/repaint-subpixel-layer-in-subpixel-composited-layer-expected.txt
@@ -2,7 +2,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -10,6 +10,7 @@
     {
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='container'",
       "bounds": [150, 75],
+      "contentsOpaqueForText": true,
       "invalidations": [
         [18, 0, 19, 18],
         [15, 0, 19, 18]
@@ -33,7 +34,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -41,6 +42,7 @@
     {
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='container'",
       "bounds": [150, 75],
+      "contentsOpaqueForText": true,
       "invalidations": [
         [18, 0, 19, 18],
         [15, 0, 19, 18]
@@ -64,7 +66,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -72,6 +74,7 @@
     {
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='container'",
       "bounds": [150, 75],
+      "contentsOpaqueForText": true,
       "invalidations": [
         [18, 0, 19, 18],
         [15, 0, 19, 18]
@@ -95,7 +98,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -103,6 +106,7 @@
     {
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='container'",
       "bounds": [150, 75],
+      "contentsOpaqueForText": true,
       "invalidations": [
         [18, 0, 19, 18],
         [15, 0, 19, 18]
@@ -126,7 +130,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -134,6 +138,7 @@
     {
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='container'",
       "bounds": [150, 75],
+      "contentsOpaqueForText": true,
       "invalidations": [
         [18, 0, 19, 18],
         [15, 0, 19, 18]

third_party/blink/web_tests/flag-specific/highdpi/fast/sub-pixel/should-not-repaint-subpixel-composited-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/sub-pixel/should-not-repaint-subpixel-composited-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/fast/sub-pixel/should-not-repaint-subpixel-composited-layer-expected.txt
index 675e32fb..7a3c1651f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/sub-pixel/should-not-repaint-subpixel-composited-layer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/sub-pixel/should-not-repaint-subpixel-composited-layer-expected.txt
@@ -2,7 +2,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -11,6 +11,7 @@
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='layer'",
       "position": [27, 12],
       "bounds": [150, 75],
+      "contentsOpaqueForText": true,
       "drawsContent": false
     }
   ]
@@ -19,7 +20,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -28,6 +29,7 @@
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='layer'",
       "position": [27, 12],
       "bounds": [150, 75],
+      "contentsOpaqueForText": true,
       "drawsContent": false
     }
   ]
@@ -36,7 +38,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -45,6 +47,7 @@
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='layer'",
       "position": [27, 12],
       "bounds": [150, 75],
+      "contentsOpaqueForText": true,
       "drawsContent": false
     }
   ]
@@ -53,7 +56,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -62,6 +65,7 @@
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='layer'",
       "position": [28, 12],
       "bounds": [150, 75],
+      "contentsOpaqueForText": true,
       "drawsContent": false
     }
   ]
@@ -70,7 +74,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -79,6 +83,7 @@
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='layer'",
       "position": [28, 12],
       "bounds": [150, 75],
+      "contentsOpaqueForText": true,
       "drawsContent": false
     }
   ]
@@ -87,7 +92,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -96,6 +101,7 @@
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='layer'",
       "position": [28, 12],
       "bounds": [150, 75],
+      "contentsOpaqueForText": true,
       "drawsContent": false
     }
   ]
@@ -104,7 +110,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -113,6 +119,7 @@
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='layer'",
       "position": [28, 12],
       "bounds": [150, 75],
+      "contentsOpaqueForText": true,
       "drawsContent": false
     }
   ]
@@ -121,7 +128,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -130,6 +137,7 @@
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='layer'",
       "position": [28, 12],
       "bounds": [150, 75],
+      "contentsOpaqueForText": true,
       "drawsContent": false
     }
   ]
@@ -138,7 +146,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -147,6 +155,7 @@
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='layer'",
       "position": [28, 12],
       "bounds": [150, 75],
+      "contentsOpaqueForText": true,
       "drawsContent": false
     }
   ]
@@ -155,7 +164,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -164,6 +173,7 @@
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='layer'",
       "position": [29, 12],
       "bounds": [150, 75],
+      "contentsOpaqueForText": true,
       "drawsContent": false
     }
   ]
@@ -172,7 +182,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -181,6 +191,7 @@
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='layer'",
       "position": [29, 12],
       "bounds": [150, 75],
+      "contentsOpaqueForText": true,
       "drawsContent": false
     }
   ]
@@ -189,7 +200,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -198,6 +209,7 @@
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='layer'",
       "position": [29, 12],
       "bounds": [150, 75],
+      "contentsOpaqueForText": true,
       "drawsContent": false
     }
   ]
@@ -206,7 +218,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -215,6 +227,7 @@
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='layer'",
       "position": [29, 12],
       "bounds": [150, 75],
+      "contentsOpaqueForText": true,
       "drawsContent": false
     }
   ]
@@ -223,7 +236,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -232,6 +245,7 @@
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='layer'",
       "position": [29, 12],
       "bounds": [150, 75],
+      "contentsOpaqueForText": true,
       "drawsContent": false
     }
   ]
@@ -240,7 +254,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -249,6 +263,7 @@
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='layer'",
       "position": [29, 12],
       "bounds": [150, 75],
+      "contentsOpaqueForText": true,
       "drawsContent": false
     }
   ]
@@ -257,7 +272,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -266,6 +281,7 @@
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='layer'",
       "position": [29, 12],
       "bounds": [150, 75],
+      "contentsOpaqueForText": true,
       "drawsContent": false
     }
   ]
@@ -274,7 +290,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -283,6 +299,7 @@
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='layer'",
       "position": [30, 12],
       "bounds": [150, 75],
+      "contentsOpaqueForText": true,
       "drawsContent": false
     }
   ]
@@ -291,7 +308,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -300,6 +317,7 @@
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='layer'",
       "position": [30, 12],
       "bounds": [150, 75],
+      "contentsOpaqueForText": true,
       "drawsContent": false
     }
   ]
@@ -308,7 +326,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -317,6 +335,7 @@
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='layer'",
       "position": [30, 12],
       "bounds": [150, 75],
+      "contentsOpaqueForText": true,
       "drawsContent": false
     }
   ]
@@ -325,7 +344,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -334,6 +353,7 @@
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='layer'",
       "position": [30, 12],
       "bounds": [150, 75],
+      "contentsOpaqueForText": true,
       "drawsContent": false
     }
   ]
@@ -342,7 +362,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -351,6 +371,7 @@
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='layer'",
       "position": [30, 12],
       "bounds": [150, 75],
+      "contentsOpaqueForText": true,
       "drawsContent": false
     }
   ]

third_party/blink/web_tests/flag-specific/highdpi/fast/table/003-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/table/003-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/table/003-expected.png
index a623522..085b98d4 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/table/003-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/table/003-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/table/multiple-captions-display-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/table/multiple-captions-display-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/table/multiple-captions-display-expected.png
index 3eee1b3..02e081c3 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/table/multiple-captions-display-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/table/multiple-captions-display-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/table/rowspan-paint-order-vertical-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/table/rowspan-paint-order-vertical-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/table/rowspan-paint-order-vertical-expected.png
index 02d02e2c..e1258b46 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/table/rowspan-paint-order-vertical-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/table/rowspan-paint-order-vertical-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fast/table/self-painting-row-box-shadow-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fast/table/self-painting-row-box-shadow-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/fast/table/self-painting-row-box-shadow-expected.png
index 0b2a9f7..c61d122 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/fast/table/self-painting-row-box-shadow-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fast/table/self-painting-row-box-shadow-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/fonts/data-url-sync-loading-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/fonts/data-url-sync-loading-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/fonts/data-url-sync-loading-expected.txt
new file mode 100644
index 0000000..749a43f4
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/fonts/data-url-sync-loading-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+FAIL Inline web fonts should be loaded synchronously when used. assert_equals: expected 250 but got 253
+Harness: the test ran to completion.
+

third_party/blink/web_tests/flag-specific/highdpi/http/tests/devtools/elements/highlight/highlight-css-grid-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/http/tests/devtools/elements/highlight/highlight-css-grid-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/http/tests/devtools/elements/highlight/highlight-css-grid-expected.txt
index 65ca571a..7a47f5b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/http/tests/devtools/elements/highlight/highlight-css-grid-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/http/tests/devtools/elements/highlight/highlight-css-grid-expected.txt
@@ -240,14 +240,6 @@
         {
           "x": 173,
           "y": 133
-        },
-        {
-          "x": 205.5,
-          "y": 133
-        },
-        {
-          "x": 238,
-          "y": 133
         }
       ],
       "negativeColumnLineNumberPositions": [
@@ -533,14 +525,6 @@
         {
           "x": 228,
           "y": 858
-        },
-        {
-          "x": 253,
-          "y": 858
-        },
-        {
-          "x": 278,
-          "y": 858
         }
       ],
       "negativeColumnLineNumberPositions": [

third_party/blink/web_tests/flag-specific/highdpi/http/tests/devtools/elements/highlight/highlight-css-shapes-outside-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/http/tests/devtools/elements/highlight/highlight-css-shapes-outside-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/http/tests/devtools/elements/highlight/highlight-css-shapes-outside-expected.txt
index 76894f3..2b028a7f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/http/tests/devtools/elements/highlight/highlight-css-shapes-outside-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/http/tests/devtools/elements/highlight/highlight-css-shapes-outside-expected.txt
@@ -5,16 +5,6 @@
     {
       "path": [
         "M",
-        92,
-        12,
-        "Q",
-        125,
-        12,
-        149,
-        35,
-        "Q",
-        172,
-        59,
         172,
         92,
         "Q",
@@ -47,6 +37,16 @@
         12,
         92,
         12,
+        "Q",
+        125,
+        12,
+        149,
+        35,
+        "Q",
+        172,
+        59,
+        172,
+        92,
         "Z"
       ],
       "fillColor": "rgba(0, 0, 0, 0)"
@@ -54,16 +54,6 @@
     {
       "path": [
         "M",
-        92,
-        -20,
-        "Q",
-        138,
-        -20,
-        171,
-        13,
-        "Q",
-        204,
-        46,
         204,
         92,
         "Q",
@@ -96,6 +86,16 @@
         -20,
         92,
         -20,
+        "Q",
+        138,
+        -20,
+        171,
+        13,
+        "Q",
+        204,
+        46,
+        204,
+        92,
         "Z"
       ],
       "fillColor": "rgba(128, 128, 128, 0)"
@@ -614,16 +614,6 @@
     {
       "path": [
         "M",
-        812,
-        12,
-        "Q",
-        845,
-        12,
-        869,
-        28,
-        "Q",
-        892,
-        45,
         892,
         68,
         "Q",
@@ -656,6 +646,16 @@
         12,
         812,
         12,
+        "Q",
+        845,
+        12,
+        869,
+        28,
+        "Q",
+        892,
+        45,
+        892,
+        68,
         "Z"
       ],
       "fillColor": "rgba(0, 0, 0, 0)"
@@ -663,16 +663,6 @@
     {
       "path": [
         "M",
-        812,
-        -20,
-        "Q",
-        858,
-        -20,
-        891,
-        6,
-        "Q",
-        924,
-        32,
         924,
         68,
         "Q",
@@ -705,6 +695,16 @@
         -20,
         812,
         -20,
+        "Q",
+        858,
+        -20,
+        891,
+        6,
+        "Q",
+        924,
+        32,
+        924,
+        68,
         "Z"
       ],
       "fillColor": "rgba(128, 128, 128, 0)"

third_party/blink/web_tests/flag-specific/highdpi/http/tests/devtools/elements/highlight/highlight-css-shapes-outside-scroll-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/http/tests/devtools/elements/highlight/highlight-css-shapes-outside-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/http/tests/devtools/elements/highlight/highlight-css-shapes-outside-scroll-expected.txt
index 141af42..4f52665 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/http/tests/devtools/elements/highlight/highlight-css-shapes-outside-scroll-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/http/tests/devtools/elements/highlight/highlight-css-shapes-outside-scroll-expected.txt
@@ -5,16 +5,6 @@
     {
       "path": [
         "M",
-        92,
-        12,
-        "Q",
-        125,
-        12,
-        149,
-        35,
-        "Q",
-        172,
-        59,
         172,
         92,
         "Q",
@@ -47,6 +37,16 @@
         12,
         92,
         12,
+        "Q",
+        125,
+        12,
+        149,
+        35,
+        "Q",
+        172,
+        59,
+        172,
+        92,
         "Z"
       ],
       "fillColor": "rgba(0, 0, 0, 0)"
@@ -54,16 +54,6 @@
     {
       "path": [
         "M",
-        92,
-        -20,
-        "Q",
-        138,
-        -20,
-        171,
-        13,
-        "Q",
-        204,
-        46,
         204,
         92,
         "Q",
@@ -96,6 +86,16 @@
         -20,
         92,
         -20,
+        "Q",
+        138,
+        -20,
+        171,
+        13,
+        "Q",
+        204,
+        46,
+        204,
+        92,
         "Z"
       ],
       "fillColor": "rgba(128, 128, 128, 0)"
@@ -200,16 +200,6 @@
     {
       "path": [
         "M",
-        92,
-        12,
-        "Q",
-        125,
-        12,
-        149,
-        35,
-        "Q",
-        172,
-        59,
         172,
         92,
         "Q",
@@ -242,6 +232,16 @@
         12,
         92,
         12,
+        "Q",
+        125,
+        12,
+        149,
+        35,
+        "Q",
+        172,
+        59,
+        172,
+        92,
         "Z"
       ],
       "fillColor": "rgba(0, 0, 0, 0)"
@@ -249,16 +249,6 @@
     {
       "path": [
         "M",
-        92,
-        -20,
-        "Q",
-        138,
-        -20,
-        171,
-        13,
-        "Q",
-        204,
-        46,
         204,
         92,
         "Q",
@@ -291,6 +281,16 @@
         -20,
         92,
         -20,
+        "Q",
+        138,
+        -20,
+        171,
+        13,
+        "Q",
+        204,
+        46,
+        204,
+        92,
         "Z"
       ],
       "fillColor": "rgba(128, 128, 128, 0)"

third_party/blink/web_tests/flag-specific/highdpi/http/tests/devtools/elements/highlight/highlight-multiple-css-grid-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/http/tests/devtools/elements/highlight/highlight-multiple-css-grid-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/http/tests/devtools/elements/highlight/highlight-multiple-css-grid-expected.txt
index e708d00..b9699a99 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/http/tests/devtools/elements/highlight/highlight-multiple-css-grid-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/http/tests/devtools/elements/highlight/highlight-multiple-css-grid-expected.txt
@@ -145,14 +145,6 @@
         {
           "x": 173,
           "y": 133
-        },
-        {
-          "x": 205.5,
-          "y": 133
-        },
-        {
-          "x": 238,
-          "y": 133
         }
       ],
       "negativeColumnLineNumberPositions": [
@@ -351,14 +343,6 @@
         {
           "x": 108,
           "y": -92
-        },
-        {
-          "x": 218,
-          "y": -92
-        },
-        {
-          "x": 328,
-          "y": -92
         }
       ],
       "negativeColumnLineNumberPositions": [

third_party/blink/web_tests/flag-specific/highdpi/http/tests/devtools/forced-layout-in-microtask-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/http/tests/devtools/forced-layout-in-microtask-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/http/tests/devtools/forced-layout-in-microtask-expected.txt
index 6f5c660..551a725 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/http/tests/devtools/forced-layout-in-microtask-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/http/tests/devtools/forced-layout-in-microtask-expected.txt
@@ -37,5 +37,5 @@
     startTime : <number>
     type : "Layout"
 }
-Text details for Layout: test://evaluations/0/forced-layout-in-microtask.js:21
+Text details for Layout: test://evaluations/0/forced-layout-in-microtask.js:21:36
 

third_party/blink/web_tests/flag-specific/highdpi/http/tests/devtools/layers/layer-tree-model-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/http/tests/devtools/layers/layer-tree-model-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/http/tests/devtools/layers/layer-tree-model-expected.txt
index bbf9133..9d13731 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/http/tests/devtools/layers/layer-tree-model-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/http/tests/devtools/layers/layer-tree-model-expected.txt
@@ -3,7 +3,6 @@
 <invalid node id> 0x0 (0)
     #document (1)
     #document (1)
-    #document (1)
     div#subframe1 120x120 (1)
     div#a (1)
     div#b1 (1)
@@ -15,7 +14,6 @@
 <invalid node id> 0x0 (0)
     #document (1)
     #document (1)
-    #document (1)
     div#subframe1 120x120 (1)
     div#a (1)
     div#b2 (1)
@@ -27,7 +25,6 @@
 <invalid node id> 0x0 (0)
     #document (1)
     #document (1)
-    #document (1)
     div#subframe1 120x120 (1)
     div#a (1)
     div#b2 (1)

third_party/blink/web_tests/flag-specific/highdpi/http/tests/devtools/tracing/timeline-layout/timeline-layout-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/http/tests/devtools/tracing/timeline-layout/timeline-layout-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/http/tests/devtools/tracing/timeline-layout/timeline-layout-expected.txt
index 52f15f8..422810c1 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/http/tests/devtools/tracing/timeline-layout/timeline-layout-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/http/tests/devtools/tracing/timeline-layout/timeline-layout-expected.txt
@@ -37,7 +37,7 @@
     startTime : <number>
     type : "Layout"
 }
-Text details for Layout: test://evaluations/0/timeline-layout.js:40
+Text details for Layout: test://evaluations/0/timeline-layout.js:40:32
 Layout Properties:
 {
     data : {
@@ -75,5 +75,5 @@
     startTime : <number>
     type : "Layout"
 }
-Text details for Layout: test://evaluations/0/timeline-layout.js:40
+Text details for Layout: test://evaluations/0/timeline-layout.js:40:32
 

third_party/blink/web_tests/flag-specific/highdpi/http/tests/inspector-protocol/accessibility/accessibility-ignoredNodes-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/http/tests/inspector-protocol/accessibility/accessibility-ignoredNodes-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/http/tests/inspector-protocol/accessibility/accessibility-ignoredNodes-expected.txt
index 0b01f34..a64c0ea 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/http/tests/inspector-protocol/accessibility/accessibility-ignoredNodes-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/http/tests/inspector-protocol/accessibility/accessibility-ignoredNodes-expected.txt
@@ -2,12 +2,15 @@
 
 RootWebArea
   *none
+  *none
 {
+    childIds : <object>
     domNode : html
     ignored : true
     ignoredReasons : [
     ]
     nodeId : <string>
+    parentId : <string>
     role : {
         type : role
         value : none
@@ -15,9 +18,12 @@
 }
 
 RootWebArea
-  img
-    *SvgRoot
+  none
+    none
+      img
+        *img
 {
+    childIds : <object>
     domNode : svg
     ignored : false
     name : {
@@ -43,17 +49,22 @@
         value : 
     }
     nodeId : <string>
+    parentId : <string>
     properties : [
     ]
     role : {
-        type : internalRole
-        value : SvgRoot
+        type : role
+        value : img
     }
 }
 
 RootWebArea
-  *none
+  none
+    none
+      *none
+      *none
 {
+    childIds : <object>
     domNode : div
     ignored : true
     ignoredReasons : [
@@ -66,6 +77,7 @@
         }
     ]
     nodeId : <string>
+    parentId : <string>
     role : {
         type : role
         value : none
@@ -73,8 +85,13 @@
 }
 
 RootWebArea
-  *none
+  none
+    none
+      none
+        *none
+        *none
 {
+    childIds : <object>
     domNode : div
     ignored : true
     ignoredReasons : [
@@ -91,6 +108,7 @@
         }
     ]
     nodeId : <string>
+    parentId : <string>
     role : {
         type : role
         value : none
@@ -98,8 +116,11 @@
 }
 
 RootWebArea
-  *none
+  none
+    none
+      *none
 {
+    childIds : <object>
     domNode : ol
     ignored : true
     ignoredReasons : [
@@ -112,6 +133,7 @@
         }
     ]
     nodeId : <string>
+    parentId : <string>
     role : {
         type : role
         value : none
@@ -119,8 +141,12 @@
 }
 
 RootWebArea
-  *none
+  none
+    none
+      *none
+      *none
 {
+    childIds : <object>
     domNode : li
     ignored : true
     ignoredReasons : [
@@ -133,6 +159,7 @@
         }
     ]
     nodeId : <string>
+    parentId : <string>
     role : {
         type : role
         value : none
@@ -140,9 +167,12 @@
 }
 
 RootWebArea
-  *generic
-    StaticText "Div in list isn't presentational"
+  none
+    none
+      *generic
+        StaticText "Div in list isn't presentational"
 {
+    childIds : <object>
     domNode : div
     ignored : false
     name : {
@@ -164,6 +194,7 @@
         value : 
     }
     nodeId : <string>
+    parentId : <string>
     properties : [
     ]
     role : {
@@ -173,9 +204,12 @@
 }
 
 RootWebArea
-  *LabelText
-    StaticText "Content within label refers to label container"
+  none
+    none
+      *LabelText
+        StaticText "Content within label refers to label container"
 {
+    childIds : <object>
     domNode : label
     ignored : false
     name : {
@@ -197,6 +231,7 @@
         value : 
     }
     nodeId : <string>
+    parentId : <string>
     properties : [
     ]
     role : {
@@ -206,9 +241,12 @@
 }
 
 RootWebArea
-  LabelText
-    *none
+  none
+    none
+      LabelText
+        *none
 {
+    childIds : <object>
     domNode : span
     ignored : true
     ignoredReasons : [
@@ -221,6 +259,7 @@
         }
     ]
     nodeId : <string>
+    parentId : <string>
     role : {
         type : role
         value : none
@@ -228,8 +267,11 @@
 }
 
 RootWebArea
-  *none
+  none
+    none
+      *none
 {
+    childIds : <object>
     domNode : div
     ignored : true
     ignoredReasons : [
@@ -242,6 +284,7 @@
         }
     ]
     nodeId : <string>
+    parentId : <string>
     role : {
         type : role
         value : none
@@ -249,8 +292,11 @@
 }
 
 RootWebArea
-  *none
+  none
+    none
+      *none
 {
+    childIds : <object>
     domNode : span
     ignored : true
     ignoredReasons : [
@@ -263,6 +309,7 @@
         }
     ]
     nodeId : <string>
+    parentId : <string>
     role : {
         type : role
         value : none
@@ -270,8 +317,11 @@
 }
 
 RootWebArea
-  *none
+  none
+    none
+      *none
 {
+    childIds : <object>
     domNode : canvas
     ignored : true
     ignoredReasons : [
@@ -284,6 +334,7 @@
         }
     ]
     nodeId : <string>
+    parentId : <string>
     role : {
         type : role
         value : none
@@ -291,8 +342,11 @@
 }
 
 RootWebArea
-  *none
+  none
+    none
+      *none
 {
+    childIds : <object>
     domNode : canvas
     ignored : true
     ignoredReasons : [
@@ -305,6 +359,7 @@
         }
     ]
     nodeId : <string>
+    parentId : <string>
     role : {
         type : role
         value : none
@@ -312,12 +367,15 @@
 }
 
 RootWebArea
-  *combobox
-    MenuListPopup
-      menuitem "Options should be"
-      menuitem "sent down even though"
-      menuitem "they are grandchildren"
+  none
+    none
+      *combobox
+        MenuListPopup
+          menuitem "Options should be"
+          menuitem "sent down even though"
+          menuitem "they are grandchildren"
 {
+    childIds : <object>
     domNode : select
     ignored : false
     name : {
@@ -343,6 +401,7 @@
         value : 
     }
     nodeId : <string>
+    parentId : <string>
     properties : [
         [0] : {
             name : invalid
@@ -359,6 +418,13 @@
             }
         }
         [2] : {
+            name : hasPopup
+            value : {
+                type : token
+                value : menu
+            }
+        }
+        [3] : {
             name : expanded
             value : {
                 type : booleanOrUndefined
@@ -377,10 +443,13 @@
 }
 
 RootWebArea
-  combobox
-    MenuListPopup
-      *menuitem "Options should be"
+  none
+    none
+      combobox
+        MenuListPopup
+          *menuitem "Options should be"
 {
+    childIds : <object>
     domNode : option
     ignored : false
     name : {
@@ -405,6 +474,7 @@
         value : Options should be
     }
     nodeId : <string>
+    parentId : <string>
     properties : [
         [0] : {
             name : focusable
@@ -428,8 +498,11 @@
 }
 
 RootWebArea
-  *none
+  none
+    none
+      *none
 {
+    childIds : <object>
     domNode : button
     ignored : true
     ignoredReasons : [
@@ -442,6 +515,7 @@
         }
     ]
     nodeId : <string>
+    parentId : <string>
     role : {
         type : role
         value : none
@@ -449,8 +523,12 @@
 }
 
 RootWebArea
-  *none
+  none
+    none
+      none
+        *none
 {
+    childIds : <object>
     domNode : button
     ignored : true
     ignoredReasons : [
@@ -468,6 +546,7 @@
         }
     ]
     nodeId : <string>
+    parentId : <string>
     role : {
         type : role
         value : none
@@ -475,9 +554,12 @@
 }
 
 RootWebArea
-  *generic "span with ARIA label"
-    StaticText "should not be ignored"
+  none
+    none
+      *generic "span with ARIA label"
+        StaticText "should not be ignored"
 {
+    childIds : <object>
     domNode : span
     ignored : false
     name : {
@@ -508,6 +590,7 @@
         value : span with ARIA label
     }
     nodeId : <string>
+    parentId : <string>
     properties : [
     ]
     role : {
@@ -517,8 +600,11 @@
 }
 
 RootWebArea
-  *none
+  none
+    none
+      *none
 {
+    childIds : <object>
     domNode : div
     ignored : true
     ignoredReasons : [
@@ -531,6 +617,7 @@
         }
     ]
     nodeId : <string>
+    parentId : <string>
     role : {
         type : role
         value : none
@@ -538,9 +625,12 @@
 }
 
 RootWebArea
-  *generic
-    StaticText "summary element without details parent is ignored"
+  none
+    none
+      *generic
+        StaticText "summary element without details parent is ignored"
 {
+    childIds : <object>
     description : {
         type : computedString
         value : summary element without details parent is ignored
@@ -566,6 +656,7 @@
         value : 
     }
     nodeId : <string>
+    parentId : <string>
     properties : [
     ]
     role : {
@@ -575,9 +666,12 @@
 }
 
 RootWebArea
-  *button "Ignored parent shouldn't cause descendant to be missing from the tree"
-    StaticText "Ignored parent shouldn't cause descendant to be missing from the tree"
+  none
+    none
+      *button "Ignored parent shouldn't cause descendant to be missing from the tree"
+        StaticText "Ignored parent shouldn't cause descendant to be missing from the tree"
 {
+    childIds : <object>
     domNode : button
     ignored : false
     name : {
@@ -611,6 +705,7 @@
         value : Ignored parent shouldn't cause descendant to be missing from the tree
     }
     nodeId : <string>
+    parentId : <string>
     properties : [
         [0] : {
             name : invalid

third_party/blink/web_tests/flag-specific/highdpi/http/tests/loading/preload-picture-sizes-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/http/tests/loading/preload-picture-sizes-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/http/tests/loading/preload-picture-sizes-expected.txt
index f874f61..a802d5d 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/http/tests/loading/preload-picture-sizes-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/http/tests/loading/preload-picture-sizes-expected.txt
@@ -1,7 +1,6 @@
 main frame - DidStartNavigation
 main frame - ReadyToCommitNavigation
 main frame - didCommitLoadForFrame
-CONSOLE WARNING: <source src> with a <picture> parent is invalid and therefore ignored. Please use <source srcset> instead.
 main frame - didFinishDocumentLoadForFrame
 main frame - didHandleOnloadEventsForFrame
 main frame - didFinishLoadForFrame

third_party/blink/web_tests/flag-specific/highdpi/http/tests/media/video-buffered-range-contains-currentTime-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/http/tests/media/video-buffered-range-contains-currentTime-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/http/tests/media/video-buffered-range-contains-currentTime-expected.png
index 0ea2f13..4b1abbec 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/http/tests/media/video-buffered-range-contains-currentTime-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/http/tests/media/video-buffered-range-contains-currentTime-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/ietestcenter/css3/bordersbackgrounds/background-repeat-space-padding-box-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/ietestcenter/css3/bordersbackgrounds/background-repeat-space-padding-box-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/ietestcenter/css3/bordersbackgrounds/background-repeat-space-padding-box-expected.png
index 5b34b47..9778434 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/ietestcenter/css3/bordersbackgrounds/background-repeat-space-padding-box-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/ietestcenter/css3/bordersbackgrounds/background-repeat-space-padding-box-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/ietestcenter/css3/bordersbackgrounds/border-radius-not-inherited-001-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/ietestcenter/css3/bordersbackgrounds/border-radius-not-inherited-001-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/ietestcenter/css3/bordersbackgrounds/border-radius-not-inherited-001-expected.png
index 83a214b..69fa1bf 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/ietestcenter/css3/bordersbackgrounds/border-radius-not-inherited-001-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/ietestcenter/css3/bordersbackgrounds/border-radius-not-inherited-001-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/ietestcenter/css3/bordersbackgrounds/border-radius-sum-of-radii-001-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/ietestcenter/css3/bordersbackgrounds/border-radius-sum-of-radii-001-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/ietestcenter/css3/bordersbackgrounds/border-radius-sum-of-radii-001-expected.png
index c6f77ec..7051aaaa 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/ietestcenter/css3/bordersbackgrounds/border-radius-sum-of-radii-001-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/ietestcenter/css3/bordersbackgrounds/border-radius-sum-of-radii-001-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/ietestcenter/css3/bordersbackgrounds/border-radius-sum-of-radii-002-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/ietestcenter/css3/bordersbackgrounds/border-radius-sum-of-radii-002-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/ietestcenter/css3/bordersbackgrounds/border-radius-sum-of-radii-002-expected.png
index 8423cbd..41cca20 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/ietestcenter/css3/bordersbackgrounds/border-radius-sum-of-radii-002-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/ietestcenter/css3/bordersbackgrounds/border-radius-sum-of-radii-002-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/ietestcenter/css3/bordersbackgrounds/border-top-left-radius-values-005-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/ietestcenter/css3/bordersbackgrounds/border-top-left-radius-values-005-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/ietestcenter/css3/bordersbackgrounds/border-top-left-radius-values-005-expected.png
index e26fcb6..618d3329c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/ietestcenter/css3/bordersbackgrounds/border-top-left-radius-values-005-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/ietestcenter/css3/bordersbackgrounds/border-top-left-radius-values-005-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/images/color-profile-animate-rotate-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/images/color-profile-animate-rotate-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/images/color-profile-animate-rotate-expected.png
index 4cc2c43f..a29b829 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/images/color-profile-animate-rotate-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/images/color-profile-animate-rotate-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/images/color-profile-clip-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/images/color-profile-clip-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/images/color-profile-clip-expected.png
index 3a4eab8..2a4cc665 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/images/color-profile-clip-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/images/color-profile-clip-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/images/optimize-contrast-canvas-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/images/optimize-contrast-canvas-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/images/optimize-contrast-canvas-expected.png
index ddebadb..ef378d0 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/images/optimize-contrast-canvas-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/images/optimize-contrast-canvas-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/images/optimize-contrast-image-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/images/optimize-contrast-image-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/images/optimize-contrast-image-expected.png
index ddebadb..ef378d0 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/images/optimize-contrast-image-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/images/optimize-contrast-image-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/images/yuv-decode-eligible/color-profile-border-radius-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/images/yuv-decode-eligible/color-profile-border-radius-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/images/yuv-decode-eligible/color-profile-border-radius-expected.png
index 20c9509..9ce794ef 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/images/yuv-decode-eligible/color-profile-border-radius-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/images/yuv-decode-eligible/color-profile-border-radius-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/inspector-protocol/emulation/set-force-dark-mode-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/inspector-protocol/emulation/set-force-dark-mode-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/inspector-protocol/emulation/set-force-dark-mode-expected.txt
new file mode 100644
index 0000000..c4647a4
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/inspector-protocol/emulation/set-force-dark-mode-expected.txt
@@ -0,0 +1,18 @@
+Tests that forced dark mode can be emulated.
+<p>Baseline:
+<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAAXNSR0IArs4c6QAAAGBJREFUaIHtzwENACEQwLDn/Xs+XEBSVgXbmpn5HvLfDjitYV3DuoZ1Desa1jWsa1jXsK5hXcO6hnUN6xrWNaxrWNewrmFdw7qGdQ3rGtY1rGtY17CuYV3DuoZ1Desa1m2HmAR0FFEPGwAAAABJRU5ErkJggg==">
+<p>Emulating auto dark mode: true
+<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAAXNSR0IArs4c6QAAAGJJREFUaIHtzwERwCAQwDBAwvv3Olxsd12ioN0z86wfOV8HvM1wneE6w3WG6wzXGa4zXGe4znCd4TrDdYbrDNcZrjNcZ7jOcJ3hOsN1husM1xmuM1xnuM5wneE6w3WG6wzXXaOPAa0xbo5iAAAAAElFTkSuQmCC">
+<p>Emulating auto dark mode: true
+<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAAXNSR0IArs4c6QAAAGJJREFUaIHtzwERwCAQwDBAwvv3Olxsd12ioN0z86wfOV8HvM1wneE6w3WG6wzXGa4zXGe4znCd4TrDdYbrDNcZrjNcZ7jOcJ3hOsN1husM1xmuM1xnuM5wneE6w3WG6wzXXaOPAa0xbo5iAAAAAElFTkSuQmCC">
+<p>Emulating auto dark mode: false
+<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAAXNSR0IArs4c6QAAAGBJREFUaIHtzwENACEQwLDn/Xs+XEBSVgXbmpn5HvLfDjitYV3DuoZ1Desa1jWsa1jXsK5hXcO6hnUN6xrWNaxrWNewrmFdw7qGdQ3rGtY1rGtY17CuYV3DuoZ1Desa1m2HmAR0FFEPGwAAAABJRU5ErkJggg==">
+<p>Emulating auto dark mode: true
+<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAAXNSR0IArs4c6QAAAGJJREFUaIHtzwERwCAQwDBAwvv3Olxsd12ioN0z86wfOV8HvM1wneE6w3WG6wzXGa4zXGe4znCd4TrDdYbrDNcZrjNcZ7jOcJ3hOsN1husM1xmuM1xnuM5wneE6w3WG6wzXXaOPAa0xbo5iAAAAAElFTkSuQmCC">
+<p>Emulating auto dark mode: undefined
+<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAAXNSR0IArs4c6QAAAGBJREFUaIHtzwENACEQwLDn/Xs+XEBSVgXbmpn5HvLfDjitYV3DuoZ1Desa1jWsa1jXsK5hXcO6hnUN6xrWNaxrWNewrmFdw7qGdQ3rGtY1rGtY17CuYV3DuoZ1Desa1m2HmAR0FFEPGwAAAABJRU5ErkJggg==">
+<p>Emulating auto dark mode: true
+<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAAXNSR0IArs4c6QAAAGJJREFUaIHtzwERwCAQwDBAwvv3Olxsd12ioN0z86wfOV8HvM1wneE6w3WG6wzXGa4zXGe4znCd4TrDdYbrDNcZrjNcZ7jOcJ3hOsN1husM1xmuM1xnuM5wneE6w3WG6wzXXaOPAa0xbo5iAAAAAElFTkSuQmCC">
+<p>Navigating&mldr;
+<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAAXNSR0IArs4c6QAAAGJJREFUaIHtzwERwCAQwDBAwvv3Olxsd12ioN0z86wfOV8HvM1wneE6w3WG6wzXGa4zXGe4znCd4TrDdYbrDNcZrjNcZ7jOcJ3hOsN1husM1xmuM1xnuM5wneE6w3WG6wzXXaOPAa0xbo5iAAAAAElFTkSuQmCC">
+

third_party/blink/web_tests/flag-specific/highdpi/inspector-protocol/emulation/set-vision-deficiency-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/inspector-protocol/emulation/set-vision-deficiency-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/inspector-protocol/emulation/set-vision-deficiency-expected.txt
index 7bd26b49..1f28f9f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/inspector-protocol/emulation/set-vision-deficiency-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/inspector-protocol/emulation/set-vision-deficiency-expected.txt
@@ -2,21 +2,21 @@
 <p>Emulating "none":
 <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAAXNSR0IArs4c6QAAAG1JREFUaIHt2cENwDAMxDCnk3fzdAwDrLjAQfDTZ965s+HdmX1WVhcVrCtYV7CuYF3BuoJ1BesK1hWsK1hXsK5gXcG6gnVn5u688Zb87sIF6wrWFawrWFewrmBdwbqCdQXrCtYVrCtYV7CuYN0H6kMFc/ySzm8AAAAASUVORK5CYII=">
 <p>Emulating "achromatopsia":
-<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAAXNSR0IArs4c6QAAAHNJREFUaIHt2VENgEAMBUFAwuk7nWcPZDQZdgy8bPrZe+/9XgPOOROz1zOyOqhgXcG6gnUF6wrWFawrWFewrmBdwbqCdQXrCtYVrLvXWiPfwym/u3DBuoJ1BesK1hWsK1hXsK5gXcG6gnUF6wrWFawrWPcBE7QF4d3JdCQAAAAASUVORK5CYII=">
+<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAAXNSR0IArs4c6QAAAHBJREFUaIHt2cENgDAMBMGAaDctpxUow9Kw08Bp5aevvfe7BpxzJmbXPbI6qGBdwbqCdQXrCtYVrCtYV7CuYF3BuoJ1BesK1hWse6a+eFN+d+GCdQXrCtYVrCtYV7CuYF3BuoJ1BesK1hWsK1hXsO4DT9kH9LXwWAkAAAAASUVORK5CYII=">
 <p>Emulating "blurredVision":
-<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAAXNSR0IArs4c6QAAAzlJREFUaIHtmW9vmzAQhx9j8ydN1FbtvsQ+/D7Y9qJdtzYJYMNenI1JGnUSBCpRftIpClF8fnxnA3eK7z9aNk9Q/IbsDcwRkhpU441hapU3DU0KtoBqC8c7ODzC/hEOD1Dey3VbgEuhTYAE2oF+/yPDzRNsf8LmCfI/kO5BV6CcBx7ouVUy+VaDy6DeQHkrC6oAZwTSFqAyUCkoLf+jZfhKfyxD/iKw218xyrqExArw4KX2wI0G56NrSvnJFlBuZQF0DYkDvK/AO5EM2SvkL1A8w+YZ8lfQRw/sRqa0jsC6D+u3ToANmdTBThNdAIM5QnqA9E1gs79gDjHCo1LaA9tartlctow5yrZJ6rh1TsI6ZUprK85NJZE13roIjwU28t2lETTAJi76UC0COmE+AwblBK6z+v1khqhV0Pr/Ju7U+pnTBVIxZSoHmbi64TYUbCRwmLxScax3PkIqzxNdANM5Uh/YYF0aa3qoj5R8qvdP0Aq8dK3AS9cKvHStwEvXCrx0rcBLl+neQ9sLNub99NJ43ZjzvPtekokTSXyVMZgOMx82cqh49Mckue6iDpDpyjCdpdBYmYhS1ynxNOmpj7AQnEd9ehmckbqxzaS6aGugvVIRLxFAW/ixM/HljBT3Gt2LNsxT4rGFFMnrLZSVXHXpFcq0xAi7Asqd+Kg3fgGy99GeQYZqB+WdL5IrcPmVC/FGxqy2cLwXX9UO7EauN8bv8Xn2tBHYo3yzxYStlhvpNBweetC9SIc75MQlL8P+QZzYPPZ+rtJMI57OJ820ew99K4vgst5pPkeED99kQtVOOhC6OkvnMWXaflpnvbPiLgLb3J/imhjlKVst+weoC2mvmIrTjsPY/Oq3TI2c0nYjoMFc5k/ruSJc3km6JTVoG/cujKxJEyPV7WV/T3a5RNZln7CHqx0khYCGtuUJ6MjOA8QnuUbz/kFHz3xK26KXwteCDboAfemRc8ZHTEVStd1+VTBdTvWepgLgyaf/bWIplPOE7Zm/a4H3o3z2vb8IM0lB057Pa1KdrOP8r4i9Ju7X0JereKzAS9cKvHStwEvXCrx0rcBL1wq8dK3AS9cKvHStwEvXCrx0/QM0QcJUyClohQAAAABJRU5ErkJggg==">
+<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAAXNSR0IArs4c6QAAA7lJREFUaIHtmet2ozYUhT+JI7BxLu28xTx8H6z9kWmbxOYi6fTHkROSzKSrxvZaZdhrKTgxSHzsIwhbjq+/Ke0DNH9CeIbQgR/BZyBzunZAA3pjLd9BuoN0D8M9DDfQ7eCwgT5AJ9B7wMGzmzHu5xK2D9D+DtsHaP6GsAcZwCVwGZye2HUB5cYgcwcxwuigFwgCrgYEqCArDApcDhZA2PxlsDd/mMv1M1Q9+FhcngN8VxyOkBzEAMMGQgv7LeQRYgNRoVfYAN0Z6b4jITxh0N+g+QbNE0hnwC7N6LqcuSbItYGlFnwHDJAijBlCNthaYTwH0ucSQgfhYPO3eYLmEeQAbq7DCtrYNu+gOkDsQQusJGteISj05bDLVjSCj1ANpXWTVhw+eQ4L6AFyA67H7BsgJZAIVTZYUeyiTtslb1o+mZsulnk7QjWCT9ZOdjja3HURyKDZboIU0ErBl11d+eEubC9mg7no82tz2WBnOZwMUo/bAurLeEy2MPl86bv0m4Hfncj0hP6zvgfDxwt4eVPfyP/7LsvSCrx0rcBL1wq8dK3AS9cKvHStwEuXWLpYwjY67K1GgAjMeR/e8hLQUdLID+36EotSmxK4jaAetAZ19g57MrCUAK+GLKCV9Z2nsNcHF4tSf8USimTwubOkQueEeBXoBrQF3Rr4SyTr7YK+ib2vAy5oC/ke8lDc3YP2FrQpMxIPb87SgN4aeK5Bg7mdve2T3jt+WYmtCAwWhMetpYtutHxL88yTkFLSLcRbSLsS1wa7GLnM7Xi9shbSLxaEjwFkbyG8HkO8U90FcKVixKZJbCHewbiDuLFQPgmkAj1cx2VhvLflj2ED/mC5cUi8pIsnl7R7LdscIG1gbG1Nqd+a06NAqiAW6MP5wH4ksasudhIvKwJpJuxR5a6sYmUcmwLdQt9YVXWVlfRwnTu20N1CFYAW0mirAVVZRPNw+mPJlUMd5MparGGood9A18BeIFYwTJ7Tj+cB+5GEYQdVDYzmrBzzY87g8PHR4628U2WujsFguwD7Any41hw+NIBYuYXp8gdYNj2n+3Lw8dGTvLWuOLuvYKgK7OXdBRD6GigreKHM26OzMrP3ePxQgKIDfJmzfuLsEfbyc9jxZVScQnOELd8EzlPSw/vfJ/9LXxnWRtklfQHbwuuSyPmHen3sTObrFWHLSFm5efsX01x3P3T4qsdPvruwHOi5yP4X+ukCgBV46VqBl64VeOlagZeuFXjpWoGXrhV46VqBl64VeOlagZeunw74H+0SrzzaAFa7AAAAAElFTkSuQmCC">
 <p>Emulating "none":
 <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAAXNSR0IArs4c6QAAAG1JREFUaIHt2cENwDAMxDCnk3fzdAwDrLjAQfDTZ965s+HdmX1WVhcVrCtYV7CuYF3BuoJ1BesK1hWsK1hXsK5gXcG6gnVn5u688Zb87sIF6wrWFawrWFewrmBdwbqCdQXrCtYVrCtYV7CuYN0H6kMFc/ySzm8AAAAASUVORK5CYII=">
 <p>Emulating "deuteranopia":
-<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAAXNSR0IArs4c6QAAAHtJREFUaIHt2TENw1AQBcFvF6mMLzAMxmDMK5XLBMZJkx0CT6srbzvfr+8acN2fidm1j6wOKlhXsK5gXcG6gnUF6wrWFawrWFewrmBdwbqCdQXrtnU8I9/DKX934YJ1BesK1hWsK1hXsK5gXcG6gnUF6wrWFawrWFew7gdkYQZ7okAEDgAAAABJRU5ErkJggg==">
+<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAAXNSR0IArs4c6QAAAHxJREFUaIHt2UENw1AMBcGfgCibECqBYAi+YCiKHFoYlqY7BJ5WPno736/vGnDdn4nZtY+sDipYV7CuYF3BuoJ1BesK1hWsK1hXsK5gXcG6gnUF67Z1PCPfwyl/d+GCdQXrCtYVrCtYV7CuYF3BuoJ1BesK1hWsK1hXsO4H60YG5UuB8O0AAAAASUVORK5CYII=">
 <p>Emulating "none":
 <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAAXNSR0IArs4c6QAAAG1JREFUaIHt2cENwDAMxDCnk3fzdAwDrLjAQfDTZ965s+HdmX1WVhcVrCtYV7CuYF3BuoJ1BesK1hWsK1hXsK5gXcG6gnVn5u688Zb87sIF6wrWFawrWFewrmBdwbqCdQXrCtYVrCtYV7CuYN0H6kMFc/ySzm8AAAAASUVORK5CYII=">
 <p>Emulating "protanopia":
-<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAAXNSR0IArs4c6QAAAHVJREFUaIHt2UENgFAMBcEPLhCICBRgCH8go8mwY+Bl02O3+1zvGnA9I7NrH1kdVLCuYF3BuoJ1BesK1hWsK1hXsK5gXcG6gnUF6wrWbet4Z954Q3534YJ1BesK1hWsK1hXsK5gXcG6gnUF6wrWFawrWFew7gNdwAalraEIzwAAAABJRU5ErkJggg==">
+<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAAXNSR0IArs4c6QAAAHRJREFUaIHt2TENgFAQBcEPKtFBT4VXbICMS4YdAy+bK2+7z/WuAdczMrv2kdVBBesK1hWsK1hXsK5gXcG6gnUF6wrWFawrWFewrmDdto535o035HcXLlhXsK5gXcG6gnUF6wrWFawrWFewrmBdwbqCdQXrPh51ByNhQYxVAAAAAElFTkSuQmCC">
 <p>Emulating "tritanopia":
-<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAAXNSR0IArs4c6QAAAHFJREFUaIHt2UENgFAMBcEPQSROkIU7riCjyTJj4GXTY7d1ne+acD8js/vI6iDBdYLrBNcJrhNcJ7hOcJ3gOsF1gusE1wmuE1wnuO6Y+uJN+d2FBdcJrhNcJ7hOcJ3gOsF1gusE1wmuE1wnuE5wneC6Dy7KBZLCTI07AAAAAElFTkSuQmCC">
+<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAAXNSR0IArs4c6QAAAHFJREFUaIHt2UENgFAMBcEPQQ3akIBoHICMJsuMgZdNj93Wfb1rwnOOzO4jq4ME1wmuE1wnuE5wneA6wXWC6wTXCa4TXCe4TnCd4Lpj6os35XcXFlwnuE5wneA6wXWC6wTXCa4TXCe4TnCd4DrBdYLrPvQnBJVly/YCAAAAAElFTkSuQmCC">
 <p>Emulating "tritanopia":
-<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAAXNSR0IArs4c6QAAAHFJREFUaIHt2UENgFAMBcEPQSROkIU7riCjyTJj4GXTY7d1ne+acD8js/vI6iDBdYLrBNcJrhNcJ7hOcJ3gOsF1gusE1wmuE1wnuO6Y+uJN+d2FBdcJrhNcJ7hOcJ3gOsF1gusE1wmuE1wnuE5wneC6Dy7KBZLCTI07AAAAAElFTkSuQmCC">
+<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAAXNSR0IArs4c6QAAAHFJREFUaIHt2UENgFAMBcEPQQ3akIBoHICMJsuMgZdNj93Wfb1rwnOOzO4jq4ME1wmuE1wnuE5wneA6wXWC6wTXCa4TXCe4TnCd4Lpj6os35XcXFlwnuE5wneA6wXWC6wTXCa4TXCe4TnCd4DrBdYLrPvQnBJVly/YCAAAAAElFTkSuQmCC">
 <p>Emulating "some-invalid-deficiency":
 {
   "code": -32602,
@@ -48,7 +48,7 @@
   "message": "Unknown vision deficiency type"
 }
 <p>Navigating&mldr;
-<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAAXNSR0IArs4c6QAAAHFJREFUaIHt2UENgFAMBcEPQSROkIU7riCjyTJj4GXTY7d1ne+acD8js/vI6iDBdYLrBNcJrhNcJ7hOcJ3gOsF1gusE1wmuE1wnuO6Y+uJN+d2FBdcJrhNcJ7hOcJ3gOsF1gusE1wmuE1wnuE5wneC6Dy7KBZLCTI07AAAAAElFTkSuQmCC">
+<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAAXNSR0IArs4c6QAAAHFJREFUaIHt2UENgFAMBcEPQQ3akIBoHICMJsuMgZdNj93Wfb1rwnOOzO4jq4ME1wmuE1wnuE5wneA6wXWC6wTXCa4TXCe4TnCd4Lpj6os35XcXFlwnuE5wneA6wXWC6wTXCa4TXCe4TnCd4DrBdYLrPvQnBJVly/YCAAAAAElFTkSuQmCC">
 <p>Emulating "achromatopsia":
-<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAAXNSR0IArs4c6QAAAHNJREFUaIHt2VENgEAMBUFAwuk7nWcPZDQZdgy8bPrZe+/9XgPOOROz1zOyOqhgXcG6gnUF6wrWFawrWFewrmBdwbqCdQXrCtYVrLvXWiPfwym/u3DBuoJ1BesK1hWsK1hXsK5gXcG6gnUF6wrWFawrWPcBE7QF4d3JdCQAAAAASUVORK5CYII=">
+<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAAXNSR0IArs4c6QAAAHBJREFUaIHt2cENgDAMBMGAaDctpxUow9Kw08Bp5aevvfe7BpxzJmbXPbI6qGBdwbqCdQXrCtYVrCtYV7CuYF3BuoJ1BesK1hWse6a+eFN+d+GCdQXrCtYVrCtYV7CuYF3BuoJ1BesK1hWsK1hXsO4DT9kH9LXwWAkAAAAASUVORK5CYII=">
 

third_party/blink/web_tests/flag-specific/highdpi/inspector-protocol/layers/paint-profiler-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/inspector-protocol/layers/paint-profiler-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/inspector-protocol/layers/paint-profiler-expected.txt
new file mode 100644
index 0000000..9f5f4234d
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/inspector-protocol/layers/paint-profiler-expected.txt
@@ -0,0 +1,50 @@
+Sanity test for DevTools Paint Profiler.
+matchingLayers.length: 1
+Profile array length: 4
+Profile subarray 0 length: 10
+Profile timing [0][0] is a number: true
+Profile timing [0][1] is a number: true
+Profile timing [0][2] is a number: true
+Profile timing [0][3] is a number: true
+Profile timing [0][4] is a number: true
+Profile timing [0][5] is a number: true
+Profile timing [0][6] is a number: true
+Profile timing [0][7] is a number: true
+Profile timing [0][8] is a number: true
+Profile timing [0][9] is a number: true
+Profile subarray 1 length: 10
+Profile timing [1][0] is a number: true
+Profile timing [1][1] is a number: true
+Profile timing [1][2] is a number: true
+Profile timing [1][3] is a number: true
+Profile timing [1][4] is a number: true
+Profile timing [1][5] is a number: true
+Profile timing [1][6] is a number: true
+Profile timing [1][7] is a number: true
+Profile timing [1][8] is a number: true
+Profile timing [1][9] is a number: true
+Profile subarray 2 length: 10
+Profile timing [2][0] is a number: true
+Profile timing [2][1] is a number: true
+Profile timing [2][2] is a number: true
+Profile timing [2][3] is a number: true
+Profile timing [2][4] is a number: true
+Profile timing [2][5] is a number: true
+Profile timing [2][6] is a number: true
+Profile timing [2][7] is a number: true
+Profile timing [2][8] is a number: true
+Profile timing [2][9] is a number: true
+Profile subarray 3 length: 10
+Profile timing [3][0] is a number: true
+Profile timing [3][1] is a number: true
+Profile timing [3][2] is a number: true
+Profile timing [3][3] is a number: true
+Profile timing [3][4] is a number: true
+Profile timing [3][5] is a number: true
+Profile timing [3][6] is a number: true
+Profile timing [3][7] is a number: true
+Profile timing [3][8] is a number: true
+Profile timing [3][9] is a number: true
+LayerTree.replaySnapshot returned valid image: true
+DONE!
+

third_party/blink/web_tests/flag-specific/highdpi/inspector-protocol/overlay/overlay-isolated-element-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/inspector-protocol/overlay/overlay-isolated-element-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/inspector-protocol/overlay/overlay-isolated-element-expected.txt
new file mode 100644
index 0000000..b26965d0
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/inspector-protocol/overlay/overlay-isolated-element-expected.txt
@@ -0,0 +1,65 @@
+Verifies that Overlay.setShowIsolatedElements works.
+Overlay not rendered:
+
+Overlay rendered:
+{
+  "name": "drawIsolatedElementHighlight",
+  "data": {
+    "currentX": 12,
+    "currentY": 12,
+    "widthResizerBorder": [
+      "M",
+      408,
+      8,
+      "L",
+      428,
+      8,
+      "L",
+      428,
+      508,
+      "L",
+      408,
+      508,
+      "Z"
+    ],
+    "heightResizerBorder": [
+      "M",
+      8,
+      508,
+      "L",
+      408,
+      508,
+      "L",
+      408,
+      528,
+      "L",
+      8,
+      528,
+      "Z"
+    ],
+    "bidirectionResizerBorder": [
+      "M",
+      408,
+      508,
+      "L",
+      428,
+      508,
+      "L",
+      428,
+      528,
+      "L",
+      408,
+      528,
+      "Z"
+    ],
+    "currentWidth": 400,
+    "currentHeight": 500,
+    "isolationModeHighlightConfig": {
+      "resizerColor": "#000000",
+      "resizerHandleColor": "#000000",
+      "maskColor": "#000000"
+    },
+    "highlightIndex": 0
+  }
+}
+

third_party/blink/web_tests/flag-specific/highdpi/inspector-protocol/overlay/overlay-viewport-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/inspector-protocol/overlay/overlay-viewport-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/inspector-protocol/overlay/overlay-viewport-expected.txt
index 257e8c96..31955bdd 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/inspector-protocol/overlay/overlay-viewport-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/inspector-protocol/overlay/overlay-viewport-expected.txt
@@ -4,14 +4,14 @@
   {
     "name": "reset",
     "data": {
-      "deviceScaleFactor": 0.6666666865348816,
+      "deviceScaleFactor": 1.5,
       "emulationScaleFactor": 1,
       "pageScaleFactor": 1,
       "viewportSize": {
         "width": 800,
         "height": 600
       },
-      "visualViewportSize": {
+      "viewportSizeForMediaQueries": {
         "width": 800,
         "height": 600
       },
@@ -24,22 +24,52 @@
 Device metrics with changed viewport:
 [
   {
+    "name": "reset",
+    "data": {
+      "deviceScaleFactor": 1.5,
+      "emulationScaleFactor": 1,
+      "pageScaleFactor": 1,
+      "viewportSize": {
+        "width": 800,
+        "height": 600
+      },
+      "viewportSizeForMediaQueries": {
+        "width": 800,
+        "height": 600
+      },
+      "pageZoomFactor": 1,
+      "scrollX": 0,
+      "scrollY": 0
+    }
+  },
+  {
+    "name": "drawingFinished",
+    "data": ""
+  },
+  {
+    "name": "setOverlay",
+    "data": "viewportSize"
+  }
+]
+Device metrics with scrollbar:
+[
+  {
     "name": "setOverlay",
     "data": "viewportSize"
   },
   {
     "name": "reset",
     "data": {
-      "deviceScaleFactor": 0.6666666865348816,
+      "deviceScaleFactor": 1.5,
       "emulationScaleFactor": 1,
       "pageScaleFactor": 1,
       "viewportSize": {
-        "width": 500,
-        "height": 500
+        "width": 300,
+        "height": 300
       },
-      "visualViewportSize": {
-        "width": 500,
-        "height": 500
+      "viewportSizeForMediaQueries": {
+        "width": 300,
+        "height": 300
       },
       "pageZoomFactor": 1,
       "scrollX": 0,

third_party/blink/web_tests/flag-specific/highdpi/paint/float/float-under-inline-self-painting-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/float/float-under-inline-self-painting-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/float/float-under-inline-self-painting-change-expected.txt
index 47810bf..45b79fa 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/float/float-under-inline-self-painting-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/float/float-under-inline-self-painting-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/4776765-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/4776765-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/4776765-expected.png
index 24cb823..84e29d2 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/4776765-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/4776765-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/4776765-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/4776765-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/4776765-expected.txt
index 0a806ea..01519e58 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/4776765-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/4776765-expected.txt
@@ -1,12 +1,12 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "invalidations": [
-        [10, 61, 1180, 85]
+        [8, 59, 1184, 89]
       ]
     }
   ]

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/animation/opacity-animation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/animation/opacity-animation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/animation/opacity-animation-expected.txt
index 53225eeda..5093602 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/animation/opacity-animation-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/animation/opacity-animation-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/animation/transform-animation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/animation/transform-animation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/animation/transform-animation-expected.txt
index d4227eb..738fd28 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/animation/transform-animation-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/animation/transform-animation-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/animated-svg-background-offscreen-firstline-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/animated-svg-background-offscreen-firstline-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/animated-svg-background-offscreen-firstline-expected.txt
index fa695d2..df75667d 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/animated-svg-background-offscreen-firstline-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/animated-svg-background-offscreen-firstline-expected.txt
@@ -1,28 +1,27 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [3012, 3024],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 878],
-      "bounds": [1178, 22],
-      "contentsOpaque": true
+      "bounds": [1178, 22]
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 878],
-      "contentsOpaque": true
+      "bounds": [22, 878]
     },
     {
-      "name": "Scroll Corner Layer",
+      "name": "Scroll corner of LayoutView #document",
       "position": [1178, 878],
-      "bounds": [22, 22]
+      "bounds": [22, 22],
+      "contentsOpaque": true
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/background-currentColor-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/background-currentColor-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/background-currentColor-repaint-expected.txt
index 8350b9e..d7618ea 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/background-currentColor-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/background-currentColor-repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/background-generated-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/background-generated-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/background-generated-expected.txt
index 6ffc534..2262b6f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/background-generated-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/background-generated-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/background-image-paint-invalidation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/background-image-paint-invalidation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/background-image-paint-invalidation-expected.txt
index ed07c8c..49c9431 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/background-image-paint-invalidation-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/background-image-paint-invalidation-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1212, 3024],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -10,21 +10,20 @@
       ]
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 878],
-      "bounds": [1178, 22],
-      "contentsOpaque": true
+      "bounds": [1178, 22]
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 878],
-      "contentsOpaque": true
+      "bounds": [22, 878]
     },
     {
-      "name": "Scroll Corner Layer",
+      "name": "Scroll corner of LayoutView #document",
       "position": [1178, 878],
-      "bounds": [22, 22]
+      "bounds": [22, 22],
+      "contentsOpaque": true
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/background-misaligned-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/background-misaligned-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/background-misaligned-expected.txt
index 2f206e6..11371988 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/background-misaligned-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/background-misaligned-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/background-resize-height-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/background-resize-height-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/background-resize-height-expected.txt
index 7b739152..44a445e8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/background-resize-height-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/background-resize-height-expected.txt
@@ -1,108 +1,60 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='test image'",
-      "bounds": [90, 66],
+      "position": [12, 12],
+      "bounds": [165, 66],
       "contentsOpaque": true,
-      "backfaceVisibility": "hidden",
       "invalidations": [
+        [75, 0, 90, 66],
         [0, 60, 90, 6]
-      ],
-      "transform": 1
-    },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='test image size-cover'",
-      "bounds": [90, 66],
-      "contentsOpaque": true,
-      "backfaceVisibility": "hidden",
-      "invalidations": [
-        [0, 0, 90, 66]
-      ],
-      "transform": 2
+      ]
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='test image size-contain'",
-      "bounds": [90, 66],
+      "position": [162, 12],
+      "bounds": [165, 66],
       "contentsOpaque": true,
-      "backfaceVisibility": "hidden",
       "invalidations": [
-        [0, 0, 90, 66]
-      ],
-      "transform": 3
-    },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='test image fixed-height'",
-      "bounds": [90, 66],
-      "contentsOpaque": true,
-      "backfaceVisibility": "hidden",
-      "invalidations": [
-        [0, 60, 90, 6]
-      ],
-      "transform": 4
+        [0, 0, 90, 66],
+        [75, 60, 90, 6]
+      ]
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='test image percent-height'",
-      "bounds": [90, 66],
+      "position": [312, 12],
+      "bounds": [165, 66],
       "contentsOpaque": true,
-      "backfaceVisibility": "hidden",
       "invalidations": [
-        [0, 0, 90, 66]
-      ],
-      "transform": 5
-    },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='test image top'",
-      "bounds": [90, 66],
-      "contentsOpaque": true,
-      "backfaceVisibility": "hidden",
-      "invalidations": [
-        [0, 60, 90, 6]
-      ],
-      "transform": 6
+        [0, 0, 90, 66],
+        [75, 60, 90, 6]
+      ]
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='test image bottom'",
-      "bounds": [90, 66],
+      "position": [462, 12],
+      "bounds": [165, 66],
       "contentsOpaque": true,
-      "backfaceVisibility": "hidden",
       "invalidations": [
+        [75, 0, 90, 66],
         [0, 0, 90, 66]
-      ],
-      "transform": 7
-    },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='test image center'",
-      "bounds": [90, 66],
-      "contentsOpaque": true,
-      "backfaceVisibility": "hidden",
-      "invalidations": [
-        [0, 0, 90, 66]
-      ],
-      "transform": 8
+      ]
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='test image no-repeat'",
-      "bounds": [90, 66],
-      "backfaceVisibility": "hidden",
+      "position": [612, 12],
+      "bounds": [165, 66],
+      "contentsOpaqueForText": true,
       "invalidations": [
+        [75, 0, 90, 66],
         [0, 60, 90, 6]
-      ],
-      "transform": 9
-    },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='test image repeat-space'",
-      "bounds": [90, 66],
-      "backfaceVisibility": "hidden",
-      "invalidations": [
-        [0, 0, 90, 66]
-      ],
-      "transform": 10
+      ]
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='test image repeat-round'",
@@ -112,105 +64,57 @@
       "invalidations": [
         [0, 0, 90, 66]
       ],
-      "transform": 11
+      "transform": 1
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='test generated'",
-      "bounds": [90, 66],
+      "position": [12, 162],
+      "bounds": [165, 66],
       "contentsOpaque": true,
-      "backfaceVisibility": "hidden",
       "invalidations": [
+        [75, 0, 90, 66],
         [0, 0, 90, 66]
-      ],
-      "transform": 12
-    },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='test generated size-cover'",
-      "bounds": [90, 66],
-      "contentsOpaque": true,
-      "backfaceVisibility": "hidden",
-      "invalidations": [
-        [0, 0, 90, 66]
-      ],
-      "transform": 13
+      ]
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='test generated size-contain'",
-      "bounds": [90, 66],
-      "contentsOpaque": true,
-      "backfaceVisibility": "hidden",
+      "position": [162, 162],
+      "bounds": [240, 66],
+      "contentsOpaqueForText": true,
       "invalidations": [
+        [150, 0, 90, 66],
         [0, 0, 90, 66]
-      ],
-      "transform": 14
-    },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='test generated percent-height'",
-      "bounds": [90, 66],
-      "contentsOpaque": true,
-      "backfaceVisibility": "hidden",
-      "invalidations": [
-        [0, 0, 90, 66]
-      ],
-      "transform": 15
+      ]
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='test generated top'",
-      "bounds": [90, 66],
-      "contentsOpaque": true,
-      "backfaceVisibility": "hidden",
+      "position": [387, 162],
+      "bounds": [165, 66],
+      "contentsOpaqueForText": true,
       "invalidations": [
+        [75, 0, 90, 66],
         [0, 0, 90, 66]
-      ],
-      "transform": 16
-    },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='test generated bottom'",
-      "bounds": [90, 66],
-      "contentsOpaque": true,
-      "backfaceVisibility": "hidden",
-      "invalidations": [
-        [0, 0, 90, 66]
-      ],
-      "transform": 17
+      ]
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='test generated center'",
-      "bounds": [90, 66],
+      "position": [537, 162],
+      "bounds": [165, 66],
       "contentsOpaque": true,
-      "backfaceVisibility": "hidden",
       "invalidations": [
+        [75, 0, 90, 66],
         [0, 0, 90, 66]
-      ],
-      "transform": 18
-    },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='test generated no-repeat'",
-      "bounds": [90, 66],
-      "backfaceVisibility": "hidden",
-      "invalidations": [
-        [0, 0, 90, 66]
-      ],
-      "transform": 19
+      ]
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='test generated repeat-space'",
-      "bounds": [90, 66],
-      "backfaceVisibility": "hidden",
-      "invalidations": [
-        [0, 0, 90, 66]
-      ],
-      "transform": 20
-    },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='test generated repeat-round'",
-      "bounds": [90, 66],
+      "position": [687, 162],
+      "bounds": [165, 66],
       "contentsOpaque": true,
-      "backfaceVisibility": "hidden",
       "invalidations": [
+        [75, 0, 90, 66],
         [0, 0, 90, 66]
-      ],
-      "transform": 21
+      ]
     }
   ],
   "transforms": [
@@ -220,188 +124,8 @@
         [1, 0, 0, 0],
         [0, 1, 0, 0],
         [0, 0, 1, 0],
-        [12, 12, 0, 1]
-      ]
-    },
-    {
-      "id": 2,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [87, 12, 0, 1]
-      ]
-    },
-    {
-      "id": 3,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [162, 12, 0, 1]
-      ]
-    },
-    {
-      "id": 4,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [237, 12, 0, 1]
-      ]
-    },
-    {
-      "id": 5,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [312, 12, 0, 1]
-      ]
-    },
-    {
-      "id": 6,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [387, 12, 0, 1]
-      ]
-    },
-    {
-      "id": 7,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [462, 12, 0, 1]
-      ]
-    },
-    {
-      "id": 8,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [537, 12, 0, 1]
-      ]
-    },
-    {
-      "id": 9,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [612, 12, 0, 1]
-      ]
-    },
-    {
-      "id": 10,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [687, 12, 0, 1]
-      ]
-    },
-    {
-      "id": 11,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
         [762, 12, 0, 1]
       ]
-    },
-    {
-      "id": 12,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [12, 162, 0, 1]
-      ]
-    },
-    {
-      "id": 13,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [87, 162, 0, 1]
-      ]
-    },
-    {
-      "id": 14,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [162, 162, 0, 1]
-      ]
-    },
-    {
-      "id": 15,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [312, 162, 0, 1]
-      ]
-    },
-    {
-      "id": 16,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [387, 162, 0, 1]
-      ]
-    },
-    {
-      "id": 17,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [462, 162, 0, 1]
-      ]
-    },
-    {
-      "id": 18,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [537, 162, 0, 1]
-      ]
-    },
-    {
-      "id": 19,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [612, 162, 0, 1]
-      ]
-    },
-    {
-      "id": 20,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [687, 162, 0, 1]
-      ]
-    },
-    {
-      "id": 21,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [762, 162, 0, 1]
-      ]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/background-shorthand-with-gradient-and-height-changes-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/background-shorthand-with-gradient-and-height-changes-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/background-shorthand-with-gradient-and-height-changes-expected.txt
index a0d9b82..cc38787 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/background-shorthand-with-gradient-and-height-changes-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/background-shorthand-with-gradient-and-height-changes-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/background-size-auto-with-gradient-and-height-changes-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/background-size-auto-with-gradient-and-height-changes-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/background-size-auto-with-gradient-and-height-changes-expected.txt
index a0d9b82..cc38787 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/background-size-auto-with-gradient-and-height-changes-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/background-size-auto-with-gradient-and-height-changes-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/backgroundSizeRepaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/backgroundSizeRepaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/backgroundSizeRepaint-expected.txt
index 9077ffc..ac89135 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/backgroundSizeRepaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/backgroundSizeRepaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/body-background-image-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/body-background-image-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/body-background-image-expected.txt
index 95f0d43..2884a090 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/body-background-image-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/body-background-image-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/change-text-content-and-background-color-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/change-text-content-and-background-color-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/change-text-content-and-background-color-expected.txt
index 0246ded..1ef00b4 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/change-text-content-and-background-color-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/change-text-content-and-background-color-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/composited-background-on-both-layers-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/composited-background-on-both-layers-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/composited-background-on-both-layers-expected.txt
index 3d8c0577..e792eab 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/composited-background-on-both-layers-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/composited-background-on-both-layers-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -17,25 +17,14 @@
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
-      "position": [30, 308],
-      "bounds": [278, 22],
+      "name": "LayoutNGBlockFlow DIV id='target'",
+      "position": [30, 30],
+      "bounds": [278, 278],
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "position": [308, 30],
-      "bounds": [22, 278],
-      "transform": 1
-    },
-    {
-      "name": "Scroll Corner Layer",
-      "position": [308, 308],
-      "bounds": [22, 22],
-      "transform": 1
-    },
-    {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow DIV id='target'",
       "position": [30, 30],
       "bounds": [278, 4500],
       "contentsOpaque": true,
@@ -44,6 +33,19 @@
         [0, 0, 278, 4500]
       ],
       "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [30, 308],
+      "bounds": [300, 22],
+      "contentsOpaqueForText": true,
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [308, 30],
+      "bounds": [22, 278],
+      "transform": 1
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/full-viewport-repaint-for-background-attachment-fixed-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/full-viewport-repaint-for-background-attachment-fixed-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/full-viewport-repaint-for-background-attachment-fixed-expected.txt
index 4d7051bd..142c9792 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/full-viewport-repaint-for-background-attachment-fixed-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/full-viewport-repaint-for-background-attachment-fixed-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 7524],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -9,11 +9,6 @@
         [0, 0, 1200, 7524]
       ],
       "transform": 1
-    },
-    {
-      "name": "Vertical Scrollbar Layer",
-      "position": [1200, 0],
-      "bounds": [0, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/html-background-image-change-size-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/html-background-image-change-size-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/html-background-image-change-size-expected.txt
index f29b2b9d..d5c7d6a 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/html-background-image-change-size-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/html-background-image-change-size-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/html-background-image-content-box-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/html-background-image-content-box-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/html-background-image-content-box-expected.txt
index f29b2b9d..d5c7d6a 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/html-background-image-content-box-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/html-background-image-content-box-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/multiple-backgrounds-style-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/multiple-backgrounds-style-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/multiple-backgrounds-style-change-expected.txt
index 856d6d4..b5c6d85 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/multiple-backgrounds-style-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/multiple-backgrounds-style-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,6 +9,7 @@
     {
       "name": "LayoutNGBlockFlow DIV id='test' class='composited box'",
       "bounds": [303, 303],
+      "contentsOpaqueForText": true,
       "transform": 2
     }
   ],

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/no-repaint-for-composited-background-attachment-fixed-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/no-repaint-for-composited-background-attachment-fixed-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/no-repaint-for-composited-background-attachment-fixed-expected.txt
index 0f15c239..8100c125 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/no-repaint-for-composited-background-attachment-fixed-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/no-repaint-for-composited-background-attachment-fixed-expected.txt
@@ -7,14 +7,9 @@
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow HTML",
       "bounds": [1200, 7524],
       "transform": 1
-    },
-    {
-      "name": "Vertical Scrollbar Layer",
-      "position": [1200, 0],
-      "bounds": [0, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/no-repaint-for-solid-color-background-attachment-fixed-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/no-repaint-for-solid-color-background-attachment-fixed-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/no-repaint-for-solid-color-background-attachment-fixed-expected.txt
index 133f179..0a15080c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/no-repaint-for-solid-color-background-attachment-fixed-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/no-repaint-for-solid-color-background-attachment-fixed-expected.txt
@@ -1,16 +1,11 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 7524],
       "contentsOpaque": true,
       "backgroundColor": "#0000FF",
       "transform": 1
-    },
-    {
-      "name": "Vertical Scrollbar Layer",
-      "position": [1200, 0],
-      "bounds": [0, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/viewport-gradient-background-html-move-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/viewport-gradient-background-html-move-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/viewport-gradient-background-html-move-overflow-expected.txt
index f29b2b9d..d5c7d6a 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/viewport-gradient-background-html-move-overflow-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/viewport-gradient-background-html-move-overflow-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/viewport-gradient-background-html-resize-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/viewport-gradient-background-html-resize-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/viewport-gradient-background-html-resize-expected.txt
index f29b2b9d..d5c7d6a 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/viewport-gradient-background-html-resize-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/viewport-gradient-background-html-resize-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/viewport-gradient-background-html-resize-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/viewport-gradient-background-html-resize-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/viewport-gradient-background-html-resize-overflow-expected.txt
index f29b2b9d..d5c7d6a 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/viewport-gradient-background-html-resize-overflow-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/background/viewport-gradient-background-html-resize-overflow-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/block-layout-inline-children-replaced-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/block-layout-inline-children-replaced-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/block-layout-inline-children-replaced-expected.txt
index 6aa4642..ea00f1f1 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/block-layout-inline-children-replaced-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/block-layout-inline-children-replaced-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/block-no-inflow-children-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/block-no-inflow-children-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/block-no-inflow-children-expected.txt
index 3db9a1a..8571105 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/block-no-inflow-children-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/block-no-inflow-children-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/block-shift-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/block-shift-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/block-shift-repaint-expected.txt
index 062835c..b97254c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/block-shift-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/block-shift-repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/border-current-color-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/border-current-color-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/border-current-color-expected.txt
index 377143a..db39637 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/border-current-color-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/border-current-color-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/border-image-outset-add-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/border-image-outset-add-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/border-image-outset-add-repaint-expected.txt
index ecd24f2..1a0d8e8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/border-image-outset-add-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/border-image-outset-add-repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/border-image-outset-change-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/border-image-outset-change-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/border-image-outset-change-repaint-expected.txt
index ecd24f2..1a0d8e8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/border-image-outset-change-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/border-image-outset-change-repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/border-radius-repaint-2-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/border-radius-repaint-2-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/border-radius-repaint-2-expected.txt
index 2d66efa..311d05c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/border-radius-repaint-2-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/border-radius-repaint-2-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1310, 900],
       "contentsOpaque": true,
       "backgroundColor": "#3F3F3F",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/border-radius-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/border-radius-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/border-radius-repaint-expected.txt
index 5379af2..056d224 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/border-radius-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/border-radius-repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/border-radius-without-border-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/border-radius-without-border-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/border-radius-without-border-expected.txt
index bc033a6..b633e35 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/border-radius-without-border-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/border-radius-without-border-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/border-repaint-glitch-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/border-repaint-glitch-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/border-repaint-glitch-expected.txt
index 3fd1d523..c65b8df5 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/border-repaint-glitch-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/border-repaint-glitch-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/box-inline-resize-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/box-inline-resize-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/box-inline-resize-expected.txt
index 4b8df2d0..46b8e22 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/box-inline-resize-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/box-inline-resize-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/box-shadow-add-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/box-shadow-add-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/box-shadow-add-repaint-expected.txt
index 2a55eb31..cb90cbc 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/box-shadow-add-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/box-shadow-add-repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/box-shadow-change-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/box-shadow-change-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/box-shadow-change-repaint-expected.txt
index 68c4fca5..4e06941 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/box-shadow-change-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/box-shadow-change-repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/box-shadow-dynamic-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/box-shadow-dynamic-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/box-shadow-dynamic-expected.txt
index 4aead1c..5ace7406 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/box-shadow-dynamic-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/box-shadow-dynamic-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/box-shadow-inset-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/box-shadow-inset-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/box-shadow-inset-repaint-expected.txt
index dc45869..75da119 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/box-shadow-inset-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/box-shadow-inset-repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/box-sizing-border-keeping-size-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/box-sizing-border-keeping-size-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/box-sizing-border-keeping-size-expected.txt
index 7528f4a..0fd337f8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/box-sizing-border-keeping-size-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/box-sizing-border-keeping-size-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/box-sizing-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/box-sizing-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/box-sizing-expected.txt
index 1cfdbe8e..aa2ea0d7 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/box-sizing-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/box-sizing-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/box-sizing-padding-keeping-size-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/box-sizing-padding-keeping-size-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/box-sizing-padding-keeping-size-expected.txt
index 7528f4a..0fd337f8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/box-sizing-padding-keeping-size-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/box-sizing-padding-keeping-size-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/hover-pseudo-borders-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/hover-pseudo-borders-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/hover-pseudo-borders-expected.txt
index 12406c0e..c39e9be 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/hover-pseudo-borders-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/hover-pseudo-borders-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/hover-pseudo-borders-whitespace-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/hover-pseudo-borders-whitespace-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/hover-pseudo-borders-whitespace-expected.txt
index f26af52..d554165 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/hover-pseudo-borders-whitespace-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/hover-pseudo-borders-whitespace-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/invalidate-box-shadow-currentColor-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/invalidate-box-shadow-currentColor-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/invalidate-box-shadow-currentColor-expected.txt
index 17743d0..c2c69a4 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/invalidate-box-shadow-currentColor-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/invalidate-box-shadow-currentColor-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/margin-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/margin-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/margin-expected.txt
index 6cdec37..a81db41 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/margin-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/margin-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/negative-shadow-box-expand-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/negative-shadow-box-expand-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/negative-shadow-box-expand-expected.txt
index c46b301..1525aec 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/negative-shadow-box-expand-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/negative-shadow-box-expand-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/negative-shadow-box-shrink-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/negative-shadow-box-shrink-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/negative-shadow-box-shrink-expected.txt
index c46b301..1525aec 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/negative-shadow-box-shrink-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/negative-shadow-box-shrink-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/padding-border-keeping-border-box-and-content-box-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/padding-border-keeping-border-box-and-content-box-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/padding-border-keeping-border-box-and-content-box-expected.txt
index eea4f80..c97619f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/padding-border-keeping-border-box-and-content-box-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/padding-border-keeping-border-box-and-content-box-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/padding-keeping-content-size-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/padding-keeping-content-size-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/padding-keeping-content-size-expected.txt
index f1dc2fd1..8ccc46f6 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/padding-keeping-content-size-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/padding-keeping-content-size-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/padding-keeping-visual-size-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/padding-keeping-visual-size-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/padding-keeping-visual-size-expected.txt
index 7528f4a..0fd337f8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/padding-keeping-visual-size-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/padding-keeping-visual-size-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/resize-with-border-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/resize-with-border-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/resize-with-border-expected.txt
index 16d0803..d8782f5 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/resize-with-border-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/resize-with-border-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/shadow-box-resize-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/shadow-box-resize-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/shadow-box-resize-expected.txt
index de09a4e..f11c982 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/shadow-box-resize-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/shadow-box-resize-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/shadow-box-resize-writing-mode-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/shadow-box-resize-writing-mode-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/shadow-box-resize-writing-mode-expected.txt
index de09a4e..f11c982 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/shadow-box-resize-writing-mode-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/box/shadow-box-resize-writing-mode-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/bugzilla-3509-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/bugzilla-3509-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/bugzilla-3509-expected.txt
index 80cc943..6eb8dc7 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/bugzilla-3509-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/bugzilla-3509-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/bugzilla-5699-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/bugzilla-5699-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/bugzilla-5699-expected.txt
index 8aad1b5..1022043 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/bugzilla-5699-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/bugzilla-5699-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/bugzilla-6278-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/bugzilla-6278-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/bugzilla-6278-expected.txt
index b91d9aa..5959936 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/bugzilla-6278-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/bugzilla-6278-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/bugzilla-6388-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/bugzilla-6388-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/bugzilla-6388-expected.txt
index 6738aea0..f5b8135 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/bugzilla-6388-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/bugzilla-6388-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/bugzilla-6473-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/bugzilla-6473-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/bugzilla-6473-expected.txt
index 4f6f194..3ed582d 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/bugzilla-6473-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/bugzilla-6473-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/bugzilla-7235-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/bugzilla-7235-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/bugzilla-7235-expected.txt
index e500598c..409585f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/bugzilla-7235-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/bugzilla-7235-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/button-inner-no-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/button-inner-no-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/button-inner-no-repaint-expected.txt
index 7f87abd0..36ece76f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/button-inner-no-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/button-inner-no-repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/button-spurious-layout-hint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/button-spurious-layout-hint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/button-spurious-layout-hint-expected.txt
index d9f3e56d..72edcfd 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/button-spurious-layout-hint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/button-spurious-layout-hint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/canvas-putImageData-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/canvas-putImageData-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/canvas-putImageData-expected.txt
index d9f3e56d..72edcfd 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/canvas-putImageData-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/canvas-putImageData-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/canvas-resize-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/canvas-resize-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/canvas-resize-expected.txt
index 02f5b1c..9072f50 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/canvas-resize-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/canvas-resize-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/canvas-resize-no-full-invalidation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/canvas-resize-no-full-invalidation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/canvas-resize-no-full-invalidation-expected.txt
index 5d2d6a5..31abe2c8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/canvas-resize-no-full-invalidation-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/canvas-resize-no-full-invalidation-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#003300",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/caret-outside-block-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/caret-outside-block-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/caret-outside-block-expected.txt
index d894005..ffc091f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/caret-outside-block-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/caret-outside-block-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/caret-subpixel-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/caret-subpixel-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/caret-subpixel-expected.png
index 7affdd98..efaebee2 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/caret-subpixel-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/caret-subpixel-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/caret-subpixel-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/caret-subpixel-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/caret-subpixel-expected.txt
index baa3ffd..65020c8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/caret-subpixel-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/caret-subpixel-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/change-clip-composited-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/change-clip-composited-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/change-clip-composited-layer-expected.txt
index 6755332..3372afd 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/change-clip-composited-layer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/change-clip-composited-layer-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,6 +9,8 @@
     {
       "name": "LayoutNGBlockFlow DIV id='target'",
       "bounds": [150, 15],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
       "invalidations": [
         [0, 0, 75, 15]
       ],

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/caret-ancestor-clip-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/caret-ancestor-clip-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/caret-ancestor-clip-change-expected.txt
index e42031620..4210c328 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/caret-ancestor-clip-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/caret-ancestor-clip-change-expected.txt
@@ -1,12 +1,12 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "invalidations": [
-        [12, 87, 163, 93]
+        [12, 87, 165, 95]
       ]
     }
   ]

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/clip-path-constant-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/clip-path-constant-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/clip-path-constant-repaint-expected.txt
index 38ddd98..831b36ab 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/clip-path-constant-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/clip-path-constant-repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,6 +9,7 @@
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='clip'",
       "bounds": [1200, 450],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#FF0000E6",
       "transform": 2
     },

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/clip-path-in-mask-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/clip-path-in-mask-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/clip-path-in-mask-layer-expected.txt
index 2471f59..6ebd91f2 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/clip-path-in-mask-layer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/clip-path-in-mask-layer-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,6 +9,7 @@
     {
       "name": "LayoutNGBlockFlow DIV",
       "bounds": [300, 300],
+      "contentsOpaque": true,
       "backgroundColor": "#0000FF",
       "invalidations": [
         [0, 0, 300, 300]

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/clip-path-resize-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/clip-path-resize-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/clip-path-resize-expected.txt
index 8b2970679..7822c75 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/clip-path-resize-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/clip-path-resize-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/clip-unclip-and-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/clip-unclip-and-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/clip-unclip-and-change-expected.txt
index a4206ba..a54b8402 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/clip-unclip-and-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/clip-unclip-and-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/clip-with-layout-delta-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/clip-with-layout-delta-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/clip-with-layout-delta-expected.txt
index 92e63c9..4cae0a6 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/clip-with-layout-delta-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/clip-with-layout-delta-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/clipped-relative-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/clipped-relative-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/clipped-relative-expected.txt
index 834f000..c00baf4 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/clipped-relative-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/clipped-relative-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/control-clip-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/control-clip-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/control-clip-expected.txt
index ea1df3b..530c41c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/control-clip-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/control-clip-expected.txt
@@ -1,12 +1,12 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "invalidations": [
-        [13, 126, 95, 22],
+        [12, 114, 300, 45],
         [115, 170, 94, 22]
       ]
     }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/css-clip-change-stacking-child-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/css-clip-change-stacking-child-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/css-clip-change-stacking-child-expected.txt
index ab8536f0..93294c0 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/css-clip-change-stacking-child-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/css-clip-change-stacking-child-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#ADD8E6",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/intermediate-layout-position-clip-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/intermediate-layout-position-clip-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/intermediate-layout-position-clip-expected.txt
index 410469d9..1ce87a3 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/intermediate-layout-position-clip-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/intermediate-layout-position-clip-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/mask-clip-change-stacking-child-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/mask-clip-change-stacking-child-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/mask-clip-change-stacking-child-expected.txt
index cd911ad7..6374d75e 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/mask-clip-change-stacking-child-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/mask-clip-change-stacking-child-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#ADD8E6",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/outline-clip-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/outline-clip-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/outline-clip-change-expected.txt
index c003050..3cf862a 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/outline-clip-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/outline-clip-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/replaced-clipped-positioned-not-wrong-incremental-repainting-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/replaced-clipped-positioned-not-wrong-incremental-repainting-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/replaced-clipped-positioned-not-wrong-incremental-repainting-expected.txt
index d35c8ea..ec94181 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/replaced-clipped-positioned-not-wrong-incremental-repainting-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/replaced-clipped-positioned-not-wrong-incremental-repainting-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/resize-with-border-clipped-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/resize-with-border-clipped-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/resize-with-border-clipped-expected.txt
index 00fbcb18..0a14ea2 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/resize-with-border-clipped-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/resize-with-border-clipped-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/subtree-root-clip-2-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/subtree-root-clip-2-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/subtree-root-clip-2-expected.txt
index d9f3e56d..72edcfd 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/subtree-root-clip-2-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/subtree-root-clip-2-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/subtree-root-clip-3-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/subtree-root-clip-3-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/subtree-root-clip-3-expected.txt
index 055c42e..fb427f0 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/subtree-root-clip-3-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/subtree-root-clip-3-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/subtree-root-clip-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/subtree-root-clip-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/subtree-root-clip-expected.txt
index d9f3e56d..72edcfd 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/subtree-root-clip-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/clip/subtree-root-clip-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/background-attachment-local-composited-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/background-attachment-local-composited-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/background-attachment-local-composited-expected.txt
index 00b0414..3f67e78 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/background-attachment-local-composited-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/background-attachment-local-composited-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,22 +9,18 @@
     {
       "name": "LayoutNGBlockFlow DIV id='container'",
       "bounds": [600, 600],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "Horizontal Scrollbar Layer",
-      "position": [0, 600],
-      "bounds": [600, 0],
+      "name": "LayoutNGBlockFlow DIV id='container'",
+      "bounds": [600, 600],
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "Vertical Scrollbar Layer",
-      "position": [600, 0],
-      "bounds": [0, 600],
-      "transform": 1
-    },
-    {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow DIV id='container'",
       "bounds": [600, 3000],
       "contentsOpaque": true,
       "backgroundColor": "#0000FF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/background-attachment-local-equivalent-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/background-attachment-local-equivalent-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/background-attachment-local-equivalent-expected.txt
index 00b0414..0b05fb8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/background-attachment-local-equivalent-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/background-attachment-local-equivalent-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,22 +9,11 @@
     {
       "name": "LayoutNGBlockFlow DIV id='container'",
       "bounds": [600, 600],
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "Horizontal Scrollbar Layer",
-      "position": [0, 600],
-      "bounds": [600, 0],
-      "transform": 1
-    },
-    {
-      "name": "Vertical Scrollbar Layer",
-      "position": [600, 0],
-      "bounds": [0, 600],
-      "transform": 1
-    },
-    {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow DIV id='container'",
       "bounds": [600, 3000],
       "contentsOpaque": true,
       "backgroundColor": "#0000FF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/child-of-sub-pixel-offset-composited-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/child-of-sub-pixel-offset-composited-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/child-of-sub-pixel-offset-composited-layer-expected.txt
index d5a6b8d..d903bd77 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/child-of-sub-pixel-offset-composited-layer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/child-of-sub-pixel-offset-composited-layer-expected.txt
@@ -1,16 +1,18 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='container'",
-      "bounds": [21, 21],
+      "name": "LayoutNGBlockFlow (positioned) DIV id='target' class='green'",
+      "position": [-1, 0],
+      "bounds": [22, 21],
+      "contentsOpaqueForText": true,
       "invalidations": [
-        [0, 0, 21, 21]
+        [0, 0, 22, 21]
       ],
       "transform": 1
     }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/chunk-reorder-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/chunk-reorder-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/chunk-reorder-expected.txt
index add67c2e..941b611 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/chunk-reorder-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/chunk-reorder-expected.txt
@@ -1,19 +1,29 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow DIV",
-      "bounds": [1176, 825],
+      "bounds": [1176, 2],
+      "contentsOpaqueForText": true,
       "invalidations": [
-        [600, 600, 150, 150],
         [0, 0, 2, 2]
       ],
       "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='chunk5'",
+      "position": [600, 600],
+      "bounds": [225, 225],
+      "contentsOpaqueForText": true,
+      "invalidations": [
+        [0, 0, 225, 225]
+      ],
+      "transform": 1
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/clipping-should-not-repaint-composited-descendants-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/clipping-should-not-repaint-composited-descendants-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/clipping-should-not-repaint-composited-descendants-expected.txt
index 8ed9833..b6211f8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/clipping-should-not-repaint-composited-descendants-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/clipping-should-not-repaint-composited-descendants-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 924],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -10,6 +10,7 @@
       "name": "LayoutNGBlockFlow (positioned) DIV class='clipping-container'",
       "position": [150, 150],
       "bounds": [150, 150],
+      "contentsOpaqueForText": true,
       "drawsContent": false,
       "transform": 1
     },
@@ -24,6 +25,7 @@
       "name": "LayoutNGBlockFlow (positioned) DIV class='clipping-container with-initial-clipping'",
       "position": [150, 150],
       "bounds": [150, 150],
+      "contentsOpaqueForText": true,
       "drawsContent": false,
       "transform": 2
     },
@@ -35,10 +37,9 @@
       "transform": 2
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/column-span-under-composited-column-child-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/column-span-under-composited-column-child-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/column-span-under-composited-column-child-expected.txt
index de5c18db..72edcfd 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/column-span-under-composited-column-child-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/column-span-under-composited-column-child-expected.txt
@@ -1,30 +1,13 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "invalidations": [
         [12, 12, 150, 150]
       ]
-    },
-    {
-      "name": "LayoutNGBlockFlow DIV",
-      "contentsOpaque": true,
-      "drawsContent": false,
-      "transform": 1
-    }
-  ],
-  "transforms": [
-    {
-      "id": 1,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [12, 12, 0, 1]
-      ]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/composited-float-under-composited-inline-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/composited-float-under-composited-inline-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/composited-float-under-composited-inline-expected.txt
index 27efac00f..821c47d 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/composited-float-under-composited-inline-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/composited-float-under-composited-inline-expected.txt
@@ -1,17 +1,12 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "LayoutInline (relative positioned) SPAN",
-      "position": [12, 12],
-      "drawsContent": false
-    },
-    {
       "name": "LayoutNGBlockFlow (relative positioned) (floating) DIV id='float'",
       "bounds": [150, 150],
       "contentsOpaque": true,

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/composited-float-under-composited-inline-individual-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/composited-float-under-composited-inline-individual-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/composited-float-under-composited-inline-individual-expected.txt
index 27efac00f..821c47d 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/composited-float-under-composited-inline-individual-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/composited-float-under-composited-inline-individual-expected.txt
@@ -1,17 +1,12 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "LayoutInline (relative positioned) SPAN",
-      "position": [12, 12],
-      "drawsContent": false
-    },
-    {
       "name": "LayoutNGBlockFlow (relative positioned) (floating) DIV id='float'",
       "bounds": [150, 150],
       "contentsOpaque": true,

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/composited-layer-move-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/composited-layer-move-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/composited-layer-move-expected.txt
index 91d7b12..4e64da3 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/composited-layer-move-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/composited-layer-move-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/compositing-reason-removed-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/compositing-reason-removed-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/compositing-reason-removed-expected.txt
index cef701bd..51e41a97 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/compositing-reason-removed-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/compositing-reason-removed-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/containing-block-added-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/containing-block-added-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/containing-block-added-expected.txt
index a56119e..6741223 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/containing-block-added-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/containing-block-added-expected.txt
@@ -1,17 +1,15 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [75, 75, 113, 113]
-      ]
+      "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='container'",
       "bounds": [188, 188],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#0000FF",
       "invalidations": [
         [0, 0, 150, 150],

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/containing-block-added-individual-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/containing-block-added-individual-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/containing-block-added-individual-expected.txt
index a56119e..6741223 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/containing-block-added-individual-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/containing-block-added-individual-expected.txt
@@ -1,17 +1,15 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [75, 75, 113, 113]
-      ]
+      "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='container'",
       "bounds": [188, 188],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#0000FF",
       "invalidations": [
         [0, 0, 150, 150],

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/containing-block-removed-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/containing-block-removed-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/containing-block-removed-expected.txt
index 0c27edc..a5592235 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/containing-block-removed-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/containing-block-removed-expected.txt
@@ -1,13 +1,10 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [75, 75, 113, 113]
-      ]
+      "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='container'",
@@ -19,6 +16,16 @@
         [75, 75, 113, 113]
       ],
       "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='fixed'",
+      "position": [75, 75],
+      "bounds": [113, 113],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "invalidations": [
+        [0, 0, 113, 113]
+      ]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/containing-block-removed-individual-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/containing-block-removed-individual-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/containing-block-removed-individual-expected.txt
index 0d5a2b0..d09bda3 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/containing-block-removed-individual-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/containing-block-removed-individual-expected.txt
@@ -2,13 +2,10 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [75, 75, 113, 113]
-      ]
+      "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='container'",
@@ -20,6 +17,16 @@
         [75, 75, 113, 113]
       ],
       "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='fixed'",
+      "position": [75, 75],
+      "bounds": [113, 113],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "invalidations": [
+        [0, 0, 113, 113]
+      ]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/dont-invalidate-root-layer-when-composited-layer-becomes-visible-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/dont-invalidate-root-layer-when-composited-layer-becomes-visible-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/dont-invalidate-root-layer-when-composited-layer-becomes-visible-expected.txt
index ed58541..fae92c0 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/dont-invalidate-root-layer-when-composited-layer-becomes-visible-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/dont-invalidate-root-layer-when-composited-layer-becomes-visible-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,7 +9,11 @@
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='target'",
       "bounds": [300, 300],
+      "contentsOpaqueForText": true,
       "drawsContent": false,
+      "invalidations": [
+        [0, 0, 300, 300]
+      ],
       "transform": 1
     }
   ],

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/fixed-pos-inside-composited-intermediate-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/fixed-pos-inside-composited-intermediate-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/fixed-pos-inside-composited-intermediate-layer-expected.txt
index 8efca77..c527d8d 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/fixed-pos-inside-composited-intermediate-layer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/fixed-pos-inside-composited-intermediate-layer-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 45030],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -15,11 +15,12 @@
       "transform": 2
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV class='containerOverlapsComposited')",
-      "position": [18, 18],
+      "name": "LayoutNGBlockFlow (positioned) DIV class='containerOverlapsComposited'",
+      "position": [30, 30],
       "bounds": [150, 45000],
+      "contentsOpaque": true,
       "backgroundColor": "#008000",
-      "transform": 2
+      "transform": 1
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='fixed'",
@@ -29,10 +30,9 @@
       "transform": 3
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/fixed-pos-with-abs-pos-child-scroll-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/fixed-pos-with-abs-pos-child-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/fixed-pos-with-abs-pos-child-scroll-expected.txt
index da350992..9a99ebfd 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/fixed-pos-with-abs-pos-child-scroll-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/fixed-pos-with-abs-pos-child-scroll-expected.txt
@@ -2,13 +2,13 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 6032],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "LayoutNGBlockFlow (positioned) DIV id='fixed'",
+      "name": "LayoutNGBlockFlow (positioned) DIV id='abs'",
       "position": [-540, -135],
       "bounds": [540, 135],
       "contentsOpaque": true,
@@ -16,10 +16,9 @@
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/fixed-scroll-in-empty-root-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/fixed-scroll-in-empty-root-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/fixed-scroll-in-empty-root-layer-expected.txt
index aa9a68d..739bfd91 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/fixed-scroll-in-empty-root-layer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/fixed-scroll-in-empty-root-layer-expected.txt
@@ -1,8 +1,10 @@
 {
   "layers": [
     {
-      "name": "LayoutNGBlockFlow HTML",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 3024],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
       "transform": 1
     },
     {
@@ -14,8 +16,9 @@
       "transform": 2
     },
     {
-      "name": "LayoutNGBlockFlow HTML (foreground) Layer",
-      "bounds": [1178, 3024],
+      "name": "LayoutNGBlockFlow HTML",
+      "position": [12, 12],
+      "bounds": [1154, 3000],
       "transform": 1
     },
     {
@@ -26,10 +29,9 @@
       "transform": 3
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/float-under-composited-inline-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/float-under-composited-inline-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/float-under-composited-inline-expected.txt
index ca5e3cb..6da14899 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/float-under-composited-inline-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/float-under-composited-inline-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -10,6 +10,7 @@
       "name": "LayoutInline (relative positioned) SPAN",
       "position": [162, 162],
       "bounds": [150, 150],
+      "contentsOpaque": true,
       "backgroundColor": "#008000",
       "invalidations": [
         [0, 0, 150, 150]

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/iframe-inside-squashed-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/iframe-inside-squashed-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/iframe-inside-squashed-layer-expected.txt
index 638bbeb7..9add1cd 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/iframe-inside-squashed-layer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/iframe-inside-squashed-layer-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 1524],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -14,16 +14,30 @@
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV)",
-      "position": [0, -12],
-      "bounds": [450, 981],
-      "invalidations": [
-        [12, 762, 46, 26]
-      ],
-      "transform": 1
+      "name": "LayoutNGBlockFlow (positioned) DIV",
+      "position": [12, 0],
+      "bounds": [150, 750],
+      "contentsOpaqueForText": true,
+      "drawsContent": false
     },
     {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow (positioned) DIV",
+      "position": [12, 750],
+      "bounds": [450, 231],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "invalidations": [
+        [12, 12, 46, 26]
+      ]
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [428, 0],
+      "bounds": [22, 225],
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow HTML",
       "bounds": [428, 324],
       "invalidations": [
         [0, 0, 428, 324]
@@ -31,16 +45,9 @@
       "transform": 2
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "position": [428, 0],
-      "bounds": [22, 225],
-      "transform": 2
-    },
-    {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/invalidate-paint-in-iframe-in-composited-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/invalidate-paint-in-iframe-in-composited-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/invalidate-paint-in-iframe-in-composited-layer-expected.txt
index 8aab166..7214307 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/invalidate-paint-in-iframe-in-composited-layer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/invalidate-paint-in-iframe-in-composited-layer-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 924],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,16 +9,16 @@
     {
       "name": "LayoutNGBlockFlow DIV",
       "bounds": [456, 300],
+      "contentsOpaqueForText": true,
       "invalidations": [
         [15, 15, 75, 75]
       ],
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/invalidate-when-leaving-squashed-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/invalidate-when-leaving-squashed-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/invalidate-when-leaving-squashed-layer-expected.txt
index 4924bbc..814746a 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/invalidate-when-leaving-squashed-layer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/invalidate-when-leaving-squashed-layer-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -14,14 +14,14 @@
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV)",
-      "position": [63, 63],
+      "name": "LayoutNGBlockFlow (positioned) DIV",
+      "position": [75, 75],
       "bounds": [300, 300],
+      "contentsOpaque": true,
       "backgroundColor": "#ADD8E6",
       "invalidations": [
         [0, 0, 300, 300]
-      ],
-      "transform": 1
+      ]
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='target'",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/invalidation-for-subpixel-offset-of-squashed-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/invalidation-for-subpixel-offset-of-squashed-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/invalidation-for-subpixel-offset-of-squashed-layer-expected.txt
index 6acb50e..7b07bc3 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/invalidation-for-subpixel-offset-of-squashed-layer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/invalidation-for-subpixel-offset-of-squashed-layer-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -14,14 +14,14 @@
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV)",
-      "position": [63, 63],
+      "name": "LayoutNGBlockFlow (positioned) DIV",
+      "position": [75, 75],
       "bounds": [376, 376],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#FF0000",
       "invalidations": [
         [76, 76, 300, 300]
-      ],
-      "transform": 1
+      ]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/invalidations-on-composited-layers-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/invalidations-on-composited-layers-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/invalidations-on-composited-layers-expected.txt
index f8b3538..b1b8d4a8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/invalidations-on-composited-layers-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/invalidations-on-composited-layers-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/invalidations-with-large-negative-margin-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/invalidations-with-large-negative-margin-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/invalidations-with-large-negative-margin-expected.txt
index afda18bb..1fd76cd 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/invalidations-with-large-negative-margin-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/invalidations-with-large-negative-margin-expected.txt
@@ -1,37 +1,34 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow DIV",
-      "bounds": [900, 300],
+      "bounds": [878, 278],
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 278],
-      "bounds": [878, 22],
+      "bounds": [900, 22],
+      "contentsOpaqueForText": true,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [878, 0],
       "bounds": [22, 278],
       "transform": 1
     },
     {
-      "name": "Scroll Corner Layer",
-      "position": [878, 278],
-      "bounds": [22, 22],
-      "transform": 1
-    },
-    {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow (relative positioned) DIV",
       "bounds": [878, 600],
+      "contentsOpaqueForText": true,
       "invalidations": [
         [600, 0, 75, 75],
         [0, 0, 75, 75]

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/new-stacking-context-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/new-stacking-context-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/new-stacking-context-expected.txt
index 8b9301d..c9b3a99 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/new-stacking-context-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/new-stacking-context-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,23 +9,13 @@
     {
       "name": "LayoutNGBlockFlow DIV",
       "bounds": [150, 150],
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "Horizontal Scrollbar Layer",
-      "position": [0, 150],
-      "bounds": [150, 0],
-      "transform": 1
-    },
-    {
-      "name": "Vertical Scrollbar Layer",
-      "position": [150, 0],
-      "bounds": [0, 150],
-      "transform": 1
-    },
-    {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow DIV id='target'",
       "bounds": [300, 300],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#00800080",
       "invalidations": [
         [0, 0, 300, 300]

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/opacity-from-zero-to-non-zero-composited-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/opacity-from-zero-to-non-zero-composited-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/opacity-from-zero-to-non-zero-composited-expected.txt
index 3da0f260..a14cf36 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/opacity-from-zero-to-non-zero-composited-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/opacity-from-zero-to-non-zero-composited-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/overlap-test-with-filter-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/overlap-test-with-filter-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/overlap-test-with-filter-expected.txt
index 8a0fc04..220ff73 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/overlap-test-with-filter-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/overlap-test-with-filter-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,20 +9,21 @@
     {
       "name": "LayoutView #document",
       "bounds": [450, 150],
-      "contentsOpaqueForText": true,
+      "contentsOpaque": true,
       "backgroundColor": "#FFFF00"
     },
     {
       "name": "LayoutNGBlockFlow BODY",
       "bounds": [426, 126],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
       "transform": 1
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV",
+      "position": [226.5, 0],
       "bounds": [450, 150],
-      "contentsOpaque": true,
-      "backgroundColor": "#D3D3D3",
-      "transform": 2
+      "contentsOpaqueForText": true
     }
   ],
   "transforms": [
@@ -34,15 +35,6 @@
         [0, 0, 1, 0],
         [12, 12, 0, 1]
       ]
-    },
-    {
-      "id": 2,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [226.5, 0, 0, 1]
-      ]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/pointer-events-composited-scrolling-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/pointer-events-composited-scrolling-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/pointer-events-composited-scrolling-expected.txt
index 232a9aa..fd1072e 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/pointer-events-composited-scrolling-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/pointer-events-composited-scrolling-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,22 +9,11 @@
     {
       "name": "LayoutNGBlockFlow DIV id='target'",
       "bounds": [150, 150],
+      "contentsOpaqueForText": true,
       "invalidations": [
         [0, 45, 75, 75]
       ],
       "transform": 1
-    },
-    {
-      "name": "Horizontal Scrollbar Layer",
-      "position": [0, 150],
-      "bounds": [150, 0],
-      "transform": 1
-    },
-    {
-      "name": "Vertical Scrollbar Layer",
-      "position": [150, 0],
-      "bounds": [0, 150],
-      "transform": 1
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/remove-squashed-layer-plus-move-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/remove-squashed-layer-plus-move-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/remove-squashed-layer-plus-move-expected.txt
index f3764966..5ef92a2 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/remove-squashed-layer-plus-move-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/remove-squashed-layer-plus-move-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [2127, 1512],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,34 +9,42 @@
     {
       "name": "LayoutNGBlockFlow (positioned) DIV",
       "bounds": [1500, 1500],
+      "contentsOpaqueForText": true,
       "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (relative positioned) DIV class='mv-tile')",
-      "bounds": [1500, 156],
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='mv-tile'",
+      "position": [12, 12],
+      "bounds": [150, 75],
+      "contentsOpaque": true,
+      "backgroundColor": "#ADD8E6",
       "invalidations": [
-        [0, 81, 150, 75],
         [0, 0, 150, 75]
-      ],
-      "transform": 1
+      ]
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='mv-tile'",
+      "position": [12, 93],
+      "bounds": [1500, 75],
+      "contentsOpaqueForText": true,
+      "drawsContent": false
+    },
+    {
+      "name": "HorizontalScrollbar",
       "position": [0, 878],
-      "bounds": [1178, 22],
-      "contentsOpaque": true
+      "bounds": [1178, 22]
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 878],
-      "contentsOpaque": true
+      "bounds": [22, 878]
     },
     {
-      "name": "Scroll Corner Layer",
+      "name": "Scroll corner of LayoutView #document",
       "position": [1178, 878],
-      "bounds": [22, 22]
+      "bounds": [22, 22],
+      "contentsOpaque": true
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/repaint-overflow-scrolled-squashed-content-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/repaint-overflow-scrolled-squashed-content-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/repaint-overflow-scrolled-squashed-content-expected.txt
index 6793716..26def86 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/repaint-overflow-scrolled-squashed-content-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/repaint-overflow-scrolled-squashed-content-expected.txt
@@ -1,35 +1,31 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV",
-      "bounds": [300, 300],
+      "bounds": [278, 278],
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 278],
-      "bounds": [278, 22],
+      "bounds": [300, 22],
+      "contentsOpaqueForText": true,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [278, 0],
       "bounds": [22, 278],
       "transform": 1
     },
     {
-      "name": "Scroll Corner Layer",
-      "position": [278, 278],
-      "bounds": [22, 22],
-      "transform": 1
-    },
-    {
       "name": "LayoutNGBlockFlow DIV id='foo2'",
       "bounds": [225, 1500],
       "contentsOpaque": true,
@@ -37,8 +33,9 @@
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV id='foo')",
+      "name": "LayoutNGBlockFlow (positioned) DIV id='foo'",
       "bounds": [150, 1500],
+      "contentsOpaque": true,
       "backgroundColor": "#FF0000",
       "invalidations": [
         [0, 0, 150, 1500]

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/repaint-via-layout-offset-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/repaint-via-layout-offset-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/repaint-via-layout-offset-expected.txt
index f7b3df43..2b2a8ca 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/repaint-via-layout-offset-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/repaint-via-layout-offset-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -14,14 +14,14 @@
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) SPAN class='child')",
-      "position": [63, 63],
+      "name": "LayoutNGBlockFlow (positioned) SPAN class='child'",
+      "position": [75, 75],
       "bounds": [75, 75],
+      "contentsOpaque": true,
       "backgroundColor": "#008000",
       "invalidations": [
         [0, 0, 75, 75]
-      ],
-      "transform": 1
+      ]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/requires-backing-repaint-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/requires-backing-repaint-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/requires-backing-repaint-expected.png
index 3e6f65f..75367d3 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/requires-backing-repaint-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/requires-backing-repaint-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/resize-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/resize-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/resize-repaint-expected.txt
index 28cd59d..fbd52cc 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/resize-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/resize-repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,6 +9,7 @@
     {
       "name": "LayoutNGBlockFlow DIV id='resizing'",
       "bounds": [603, 311],
+      "contentsOpaqueForText": true,
       "invalidations": [
         [0, 0, 603, 311]
       ],

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/resize-squashing-layer-that-needs-full-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/resize-squashing-layer-that-needs-full-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/resize-squashing-layer-that-needs-full-repaint-expected.txt
index 328bc7b..9bec13bd 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/resize-squashing-layer-that-needs-full-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/resize-squashing-layer-that-needs-full-repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,19 +9,16 @@
     {
       "name": "LayoutNGBlockFlow DIV",
       "bounds": [750, 750],
+      "contentsOpaqueForText": true,
       "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV)",
-      "position": [70, 70],
-      "bounds": [751, 751],
-      "backgroundColor": "#ADD8E6",
-      "invalidations": [
-        [1, 1, 750, 750],
-        [0, 0, 75, 75]
-      ],
-      "transform": 1
+      "name": "LayoutNGBlockFlow (positioned) DIV",
+      "position": [83, 83],
+      "bounds": [750, 750],
+      "contentsOpaque": true,
+      "backgroundColor": "#ADD8E6"
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/scroll-fixed-layer-no-content-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/scroll-fixed-layer-no-content-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/scroll-fixed-layer-no-content-expected.txt
index 6ef0352d..112657c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/scroll-fixed-layer-no-content-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/scroll-fixed-layer-no-content-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 3024],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -10,14 +10,14 @@
     {
       "name": "LayoutNGBlockFlow (positioned) DIV",
       "bounds": [300, 300],
+      "contentsOpaqueForText": true,
       "drawsContent": false,
       "transform": 2
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/scroll-fixed-layer-out-of-view-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/scroll-fixed-layer-out-of-view-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/scroll-fixed-layer-out-of-view-expected.txt
index 0a419f0..356181c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/scroll-fixed-layer-out-of-view-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/scroll-fixed-layer-out-of-view-expected.txt
@@ -1,31 +1,16 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 3024],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "transform": 1
     },
     {
-      "name": "LayoutNGBlockFlow (positioned) DIV",
-      "bounds": [132, 132],
-      "contentsOpaque": true,
-      "backgroundColor": "#C0C0C0",
-      "transform": 2
-    },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV",
-      "bounds": [149, 149],
-      "contentsOpaque": true,
-      "backgroundColor": "#C0C0C0",
-      "transform": 3
-    },
-    {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [
@@ -37,24 +22,6 @@
         [0, 0, 1, 0],
         [0, -150, 0, 1]
       ]
-    },
-    {
-      "id": 2,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [150, -450, 0, 1]
-      ]
-    },
-    {
-      "id": 3,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [150, 1500, 0, 1]
-      ]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/scroll-fixed-squahed-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/scroll-fixed-squahed-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/scroll-fixed-squahed-layer-expected.txt
index 0e0e308..6abbc35f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/scroll-fixed-squahed-layer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/scroll-fixed-squahed-layer-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 3024],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -22,10 +22,9 @@
       "transform": 3
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/scrolling-neg-z-index-descendants-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/scrolling-neg-z-index-descendants-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/scrolling-neg-z-index-descendants-expected.txt
index 3c4079a8..d437ede 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/scrolling-neg-z-index-descendants-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/scrolling-neg-z-index-descendants-expected.txt
@@ -1,8 +1,10 @@
 {
   "layers": [
     {
-      "name": "LayoutNGBlockFlow HTML",
-      "bounds": [1200, 477]
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='neg-z'",
@@ -12,26 +14,24 @@
       "transform": 2
     },
     {
-      "name": "LayoutNGBlockFlow HTML (foreground) Layer",
-      "bounds": [1200, 477]
+      "name": "LayoutNGBlockFlow HTML",
+      "position": [12, 12],
+      "bounds": [1176, 453],
+      "contentsOpaqueForText": true,
+      "drawsContent": false
     },
     {
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='container'",
       "bounds": [153, 453],
+      "contentsOpaqueForText": true,
       "backfaceVisibility": "hidden",
       "transform": 1
     },
     {
-      "name": "Horizontal Scrollbar Layer",
-      "position": [1, 452],
-      "bounds": [150, 0],
-      "backfaceVisibility": "hidden",
-      "transform": 1
-    },
-    {
-      "name": "Vertical Scrollbar Layer",
-      "position": [152, 1],
-      "bounds": [0, 450],
+      "name": "LayoutNGBlockFlow (relative positioned) DIV id='container'",
+      "position": [2, 2],
+      "bounds": [150, 450],
+      "drawsContent": false,
       "backfaceVisibility": "hidden",
       "transform": 1
     }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/scrolling-without-painting-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/scrolling-without-painting-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/scrolling-without-painting-expected.txt
index 0f2caf3..f300fd1 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/scrolling-without-painting-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/scrolling-without-painting-expected.txt
@@ -1,38 +1,37 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow DIV id='scroller'",
-      "bounds": [303, 303],
+      "position": [2, 2],
+      "bounds": [278, 278],
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
-      "position": [1, 280],
-      "bounds": [278, 22],
+      "name": "HorizontalScrollbar",
+      "position": [1, 279],
+      "bounds": [300, 23],
+      "contentsOpaqueForText": true,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [280, 1],
       "bounds": [22, 278],
       "transform": 1
     },
     {
-      "name": "Scroll Corner Layer",
-      "position": [279, 279],
-      "bounds": [22, 22],
-      "transform": 1
-    },
-    {
-      "name": "Scrolling Contents Layer",
-      "position": [2, 2],
-      "bounds": [278, 1538],
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "position": [2, 39],
+      "bounds": [278, 1500],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
       "transform": 2
     }
   ],

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-invoke-deferred-compositing-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-invoke-deferred-compositing-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-invoke-deferred-compositing-expected.txt
index 961c178..ecc94777d 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-invoke-deferred-compositing-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-invoke-deferred-compositing-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,17 +9,11 @@
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='container' class='composited box'",
       "bounds": [450, 450],
+      "contentsOpaqueForText": true,
       "drawsContent": false
     },
     {
       "name": "LayoutHTMLCanvas (positioned) CANVAS",
-      "bounds": [300, 300],
-      "invalidations": [
-        [0, 0, 300, 300]
-      ]
-    },
-    {
-      "name": "ContentsLayer for LayoutHTMLCanvas (positioned) CANVAS",
       "bounds": [300, 300]
     }
   ]

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-clip-composited-overflow-scrolling-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-clip-composited-overflow-scrolling-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-clip-composited-overflow-scrolling-layer-expected.txt
index fce4cc8..095633b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-clip-composited-overflow-scrolling-layer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-clip-composited-overflow-scrolling-layer-expected.txt
@@ -1,37 +1,40 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow DIV id='container'",
-      "bounds": [600, 450],
+      "bounds": [578, 428],
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 428],
       "bounds": [578, 22],
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [578, 0],
       "bounds": [22, 428],
       "transform": 1
     },
     {
-      "name": "Scroll Corner Layer",
+      "name": "Scroll corner of LayoutNGBlockFlow DIV id='container'",
       "position": [578, 428],
       "bounds": [22, 22],
+      "contentsOpaque": true,
       "transform": 1
     },
     {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow DIV id='container'",
       "bounds": [1500, 1500],
+      "contentsOpaque": true,
       "backgroundColor": "#008000",
       "invalidations": [
         [0, 0, 1500, 1500]

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-clip-composited-viewport-scrolling-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-clip-composited-viewport-scrolling-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-clip-composited-viewport-scrolling-layer-expected.txt
index 3ab1b6fb..002f45e 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-clip-composited-viewport-scrolling-layer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-clip-composited-viewport-scrolling-layer-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [3012, 2274],
       "contentsOpaque": true,
       "backgroundColor": "#008000",
@@ -11,21 +11,20 @@
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 878],
-      "bounds": [1178, 22],
-      "contentsOpaque": true
+      "bounds": [1178, 22]
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 878],
-      "contentsOpaque": true
+      "bounds": [22, 878]
     },
     {
-      "name": "Scroll Corner Layer",
+      "name": "Scroll corner of LayoutView #document",
       "position": [1178, 878],
-      "bounds": [22, 22]
+      "bounds": [22, 22],
+      "contentsOpaque": true
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-paint-outline-on-foreground-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-paint-outline-on-foreground-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-paint-outline-on-foreground-layer-expected.txt
index 61212ff..f04c094 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-paint-outline-on-foreground-layer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-paint-outline-on-foreground-layer-expected.txt
@@ -1,41 +1,44 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow DIV id='container'",
-      "position": [-15, -15],
-      "bounds": [480, 480],
+      "bounds": [450, 450],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "LayoutNGBlockFlow DIV id='container'",
+      "bounds": [428, 428],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
       "position": [0, 428],
       "bounds": [428, 22],
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [428, 0],
       "bounds": [22, 428],
       "transform": 1
     },
     {
-      "name": "Scroll Corner Layer",
+      "name": "Scroll corner of LayoutNGBlockFlow DIV id='container'",
       "position": [428, 428],
       "bounds": [22, 22],
+      "contentsOpaque": true,
       "transform": 1
     },
     {
-      "name": "Scrolling Contents Layer",
-      "bounds": [4500, 4500],
-      "transform": 2
-    },
-    {
       "name": "LayoutNGBlockFlow (positioned) DIV",
       "bounds": [150, 150],
       "contentsOpaque": true,
@@ -43,9 +46,16 @@
       "transform": 2
     },
     {
-      "name": "LayoutNGBlockFlow DIV id='container' (foreground) Layer",
+      "name": "LayoutNGBlockFlow DIV id='container'",
       "bounds": [4500, 4500],
       "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='container'",
+      "position": [-15, -15],
+      "bounds": [480, 480],
+      "contentsOpaqueForText": true,
+      "transform": 1
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-repaint-composited-descendants-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-repaint-composited-descendants-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-repaint-composited-descendants-expected.txt
index 537aa29..b0a826f8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-repaint-composited-descendants-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-repaint-composited-descendants-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-repaint-composited-descendants-on-overflow-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-repaint-composited-descendants-on-overflow-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-repaint-composited-descendants-on-overflow-change-expected.txt
index 75461cc..636b1f5 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-repaint-composited-descendants-on-overflow-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-repaint-composited-descendants-on-overflow-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-repaint-composited-filter-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-repaint-composited-filter-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-repaint-composited-filter-expected.txt
index 00f08b1..6996553 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-repaint-composited-filter-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-repaint-composited-filter-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-repaint-composited-opacity-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-repaint-composited-opacity-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-repaint-composited-opacity-expected.txt
index 00f08b1..6996553 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-repaint-composited-opacity-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-repaint-composited-opacity-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-repaint-composited-transform-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-repaint-composited-transform-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-repaint-composited-transform-expected.txt
index 2d3dd9d3..68476276 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-repaint-composited-transform-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-repaint-composited-transform-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,6 +9,7 @@
     {
       "name": "LayoutNGBlockFlow DIV id='composited-box'",
       "bounds": [153, 153],
+      "contentsOpaqueForText": true,
       "transform": 2
     }
   ],

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-repaint-composited-z-index-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-repaint-composited-z-index-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-repaint-composited-z-index-expected.txt
index 734076da..f758a96 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-repaint-composited-z-index-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-repaint-composited-z-index-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-repaint-move-backface-hidden-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-repaint-move-backface-hidden-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-repaint-move-backface-hidden-expected.txt
index c2cd5cb2..015abf7b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-repaint-move-backface-hidden-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-repaint-move-backface-hidden-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-repaint-scrolling-contents-outline-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-repaint-scrolling-contents-outline-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-repaint-scrolling-contents-outline-change-expected.txt
index 156402a0..cac0b97 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-repaint-scrolling-contents-outline-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/should-not-repaint-scrolling-contents-outline-change-expected.txt
@@ -1,43 +1,52 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow DIV id='target'",
-      "position": [-15, -15],
-      "bounds": [330, 330],
-      "invalidations": [
-        [0, 0, 330, 330]
-      ],
+      "bounds": [300, 300],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "LayoutNGBlockFlow DIV id='target'",
+      "bounds": [278, 278],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='target'",
+      "bounds": [278, 3000],
+      "contentsOpaque": true,
+      "backgroundColor": "#0000FF",
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
       "position": [0, 278],
-      "bounds": [278, 22],
+      "bounds": [300, 22],
+      "contentsOpaqueForText": true,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [278, 0],
       "bounds": [22, 278],
       "transform": 1
     },
     {
-      "name": "Scroll Corner Layer",
-      "position": [278, 278],
-      "bounds": [22, 22],
-      "transform": 1
-    },
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [278, 3000],
-      "contentsOpaque": true,
-      "backgroundColor": "#0000FF",
+      "name": "LayoutNGBlockFlow DIV id='target'",
+      "position": [-15, -15],
+      "bounds": [330, 330],
+      "contentsOpaqueForText": true,
+      "invalidations": [
+        [0, 0, 330, 330]
+      ],
       "transform": 1
     }
   ],

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/squash-partial-repaint-inside-squashed-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/squash-partial-repaint-inside-squashed-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/squash-partial-repaint-inside-squashed-layer-expected.txt
index 4d7603d..7e1e1ab 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/squash-partial-repaint-inside-squashed-layer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/squash-partial-repaint-inside-squashed-layer-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -14,13 +14,28 @@
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV class='box middle')",
-      "position": [120, 120],
-      "bounds": [393, 300],
+      "name": "LayoutNGBlockFlow (positioned) DIV class='box middle'",
+      "position": [270, 270],
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#00FF00"
+    },
+    {
+      "name": "LayoutImage (positioned) IMG id='repaintdiv' class='repaintdiv'",
+      "position": [390, 390],
+      "bounds": [273, 44],
+      "contentsOpaque": true,
+      "backgroundColor": "#FA8072",
       "invalidations": [
-        [120, 120, 273, 44]
-      ],
-      "transform": 1
+        [0, 0, 273, 44]
+      ]
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='box top'",
+      "position": [510, 420],
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#00FFFF"
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/stacked-float-under-composited-inline-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/stacked-float-under-composited-inline-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/stacked-float-under-composited-inline-expected.txt
index 4dfb819..7891fd6 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/stacked-float-under-composited-inline-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/stacked-float-under-composited-inline-expected.txt
@@ -1,13 +1,13 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "LayoutInline (relative positioned) SPAN",
+      "name": "LayoutNGBlockFlow (relative positioned) (floating) DIV id='float'",
       "position": [237, 237],
       "bounds": [150, 150],
       "contentsOpaque": true,

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/text-color-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/text-color-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/text-color-change-expected.txt
index ac0f8fd..40e424f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/text-color-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/text-color-change-expected.txt
@@ -1,37 +1,33 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow PRE id='scroller'",
-      "bounds": [300, 300],
+      "bounds": [278, 278],
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 278],
-      "bounds": [278, 22],
+      "bounds": [300, 22],
+      "contentsOpaqueForText": true,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [278, 0],
       "bounds": [22, 278],
       "transform": 1
     },
     {
-      "name": "Scroll Corner Layer",
-      "position": [278, 278],
-      "bounds": [22, 22],
-      "transform": 1
-    },
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [278, 902],
+      "name": "LayoutNGBlockFlow PRE id='scroller'",
+      "bounds": [72, 902],
       "invalidations": [
         [0, 0, 72, 902]
       ],

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/text-match-highlight-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/text-match-highlight-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/text-match-highlight-expected.txt
index 145e5b6..b29ac72 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/text-match-highlight-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/text-match-highlight-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -11,29 +11,25 @@
     },
     {
       "name": "LayoutNGBlockFlow DIV",
-      "bounds": [1200, 750],
+      "bounds": [1178, 728],
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 728],
-      "bounds": [1178, 22],
+      "bounds": [1200, 22],
+      "contentsOpaqueForText": true,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
       "bounds": [22, 728],
       "transform": 1
     },
     {
-      "name": "Scroll Corner Layer",
-      "position": [1178, 728],
-      "bounds": [22, 22],
-      "transform": 1
-    },
-    {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow DIV",
       "bounds": [1178, 2010],
       "invalidations": [
         [15, 108, 345, 27],

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/tricky-element-removal-crash-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/tricky-element-removal-crash-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/tricky-element-removal-crash-expected.txt
index 7ca62a1..31b3270 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/tricky-element-removal-crash-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/tricky-element-removal-crash-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -14,9 +14,11 @@
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV)",
+      "name": "LayoutNGBlockFlow (positioned) DIV",
+      "position": [12, 12],
       "bounds": [150, 150],
-      "transform": 1
+      "contentsOpaqueForText": true,
+      "drawsContent": false
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/updating-scrolling-container-and-content-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/updating-scrolling-container-and-content-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/updating-scrolling-container-and-content-expected.txt
index 53b3e92..8bc1d3c3 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/updating-scrolling-container-and-content-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/updating-scrolling-container-and-content-expected.txt
@@ -1,37 +1,33 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow DIV id='container'",
-      "bounds": [300, 300],
+      "bounds": [278, 278],
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 278],
-      "bounds": [278, 22],
+      "bounds": [300, 22],
+      "contentsOpaqueForText": true,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [278, 0],
       "bounds": [22, 278],
       "transform": 1
     },
     {
-      "name": "Scroll Corner Layer",
-      "position": [278, 278],
-      "bounds": [22, 22],
-      "transform": 1
-    },
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [278, 351],
+      "name": "LayoutNGBlockFlow DIV id='container'",
+      "bounds": [112, 351],
       "invalidations": [
         [0, 324, 112, 26],
         [0, 297, 112, 26],

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/updating-scrolling-container-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/updating-scrolling-container-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/updating-scrolling-container-expected.txt
index e759bb9..889907d 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/updating-scrolling-container-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/updating-scrolling-container-expected.txt
@@ -1,39 +1,42 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF"
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 162, 315, 315]
+      ]
     },
     {
       "name": "LayoutNGBlockFlow DIV id='container'",
-      "bounds": [315, 315],
-      "invalidations": [
-        [0, 0, 315, 315]
-      ],
+      "position": [8, 8],
+      "bounds": [278, 278],
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [7, 286],
       "bounds": [278, 22],
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [286, 7],
       "bounds": [22, 278],
       "transform": 1
     },
     {
-      "name": "Scroll Corner Layer",
+      "name": "Scroll corner of LayoutNGBlockFlow DIV id='container'",
       "position": [285, 285],
       "bounds": [22, 22],
+      "contentsOpaque": true,
       "transform": 1
     },
     {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow DIV id='container'",
       "position": [8, 8],
       "bounds": [600, 600],
       "transform": 1

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/updating-scrolling-content-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/updating-scrolling-content-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/updating-scrolling-content-expected.txt
index adde34d..e533d524 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/updating-scrolling-content-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/compositing/updating-scrolling-content-expected.txt
@@ -1,37 +1,34 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow DIV id='scroller'",
-      "bounds": [300, 300],
+      "bounds": [278, 278],
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 278],
-      "bounds": [278, 22],
+      "bounds": [300, 22],
+      "contentsOpaqueForText": true,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [278, 0],
       "bounds": [22, 278],
       "transform": 1
     },
     {
-      "name": "Scroll Corner Layer",
-      "position": [278, 278],
-      "bounds": [22, 22],
-      "transform": 1
-    },
-    {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
       "bounds": [278, 1800],
+      "contentsOpaqueForText": true,
       "invalidations": [
         [0, 0, 278, 300]
       ],

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/crbug-371640-2-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/crbug-371640-2-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/crbug-371640-2-expected.txt
index 8d75bb2..807ed787 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/crbug-371640-2-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/crbug-371640-2-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/crbug-371640-3-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/crbug-371640-3-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/crbug-371640-3-expected.txt
index 6c563bd..128bab0 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/crbug-371640-3-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/crbug-371640-3-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/crbug-371640-4-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/crbug-371640-4-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/crbug-371640-4-expected.txt
index 9d3effa..7220fa72 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/crbug-371640-4-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/crbug-371640-4-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/crbug-371640-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/crbug-371640-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/crbug-371640-expected.txt
index 8d75bb2..807ed787 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/crbug-371640-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/crbug-371640-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/create-layer-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/create-layer-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/create-layer-repaint-expected.txt
index 7217587..cf0a731 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/create-layer-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/create-layer-repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/css-grid-layout/align-items-change-from-baseline-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/css-grid-layout/align-items-change-from-baseline-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/css-grid-layout/align-items-change-from-baseline-expected.txt
index 5e75a59..39a8a34 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/css-grid-layout/align-items-change-from-baseline-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/css-grid-layout/align-items-change-from-baseline-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/css-grid-layout/align-items-change-to-baseline-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/css-grid-layout/align-items-change-to-baseline-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/css-grid-layout/align-items-change-to-baseline-expected.txt
index 5e75a59..39a8a34 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/css-grid-layout/align-items-change-to-baseline-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/css-grid-layout/align-items-change-to-baseline-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/css-grid-layout/align-self-change-from-baseline-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/css-grid-layout/align-self-change-from-baseline-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/css-grid-layout/align-self-change-from-baseline-expected.txt
index a7b46fa..989e0a2 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/css-grid-layout/align-self-change-from-baseline-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/css-grid-layout/align-self-change-from-baseline-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/css-grid-layout/align-self-change-to-baseline-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/css-grid-layout/align-self-change-to-baseline-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/css-grid-layout/align-self-change-to-baseline-expected.txt
index a7b46fa..989e0a2 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/css-grid-layout/align-self-change-to-baseline-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/css-grid-layout/align-self-change-to-baseline-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/css-grid-layout/grid-element-change-columns-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/css-grid-layout/grid-element-change-columns-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/css-grid-layout/grid-element-change-columns-repaint-expected.txt
index 794b10f..3506d950 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/css-grid-layout/grid-element-change-columns-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/css-grid-layout/grid-element-change-columns-repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/css-grid-layout/grid-element-change-rows-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/css-grid-layout/grid-element-change-rows-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/css-grid-layout/grid-element-change-rows-repaint-expected.txt
index 4c3c507..f6f7feb 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/css-grid-layout/grid-element-change-rows-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/css-grid-layout/grid-element-change-rows-repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/css-grid-layout/grid-item-change-column-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/css-grid-layout/grid-item-change-column-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/css-grid-layout/grid-item-change-column-repaint-expected.txt
index fdf6a77..9da5a75c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/css-grid-layout/grid-item-change-column-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/css-grid-layout/grid-item-change-column-repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/css-grid-layout/grid-item-change-row-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/css-grid-layout/grid-item-change-row-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/css-grid-layout/grid-item-change-row-repaint-expected.txt
index bec9981..d91b456 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/css-grid-layout/grid-item-change-row-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/css-grid-layout/grid-item-change-row-repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/css-grid-layout/grid-item-z-index-change-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/css-grid-layout/grid-item-z-index-change-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/css-grid-layout/grid-item-z-index-change-repaint-expected.txt
index 9a6a8f6..0d0c71a 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/css-grid-layout/grid-item-z-index-change-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/css-grid-layout/grid-item-z-index-change-repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/cull-rect-change-crash-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/cull-rect-change-crash-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/cull-rect-change-crash-expected.txt
index 1d599367..4df11b2 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/cull-rect-change-crash-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/cull-rect-change-crash-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/delete-into-nested-block-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/delete-into-nested-block-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/delete-into-nested-block-expected.png
index 9438b3e..d53c6ce 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/delete-into-nested-block-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/delete-into-nested-block-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/delete-into-nested-block-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/delete-into-nested-block-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/delete-into-nested-block-expected.txt
index 8f893f19..3f56fd7 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/delete-into-nested-block-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/delete-into-nested-block-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/details-open-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/details-open-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/details-open-repaint-expected.txt
index a52ccac..84632ea 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/details-open-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/details-open-repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/empty-object-move-and-resize-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/empty-object-move-and-resize-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/empty-object-move-and-resize-expected.txt
index 7f87abd0..36ece76f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/empty-object-move-and-resize-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/empty-object-move-and-resize-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-composite-1-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-composite-1-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-composite-1-expected.txt
index 03cd957b..24dad3c2 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-composite-1-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-composite-1-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-composite-2-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-composite-2-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-composite-2-expected.txt
index f38753b9..cc32fc4b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-composite-2-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-composite-2-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-composite-3-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-composite-3-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-composite-3-expected.txt
index 0d64f73..d4d91e3 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-composite-3-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-composite-3-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-composite-4-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-composite-4-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-composite-4-expected.txt
index f38753b9..cc32fc4b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-composite-4-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-composite-4-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-composite-5-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-composite-5-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-composite-5-expected.txt
index 03cd957b..24dad3c2 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-composite-5-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-composite-5-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-composite-6-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-composite-6-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-composite-6-expected.txt
index 0ce7279d..efcd45d 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-composite-6-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-composite-6-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-displacement-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-displacement-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-displacement-expected.txt
index 94eb48e..b29df63 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-displacement-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-displacement-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-gaussianblur-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-gaussianblur-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-gaussianblur-expected.txt
index e61c0dd..4ecd870 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-gaussianblur-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-gaussianblur-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-gaussianblur-xonly-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-gaussianblur-xonly-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-gaussianblur-xonly-expected.txt
index 00f3beeb..17c3def 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-gaussianblur-xonly-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-gaussianblur-xonly-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-gaussianblur-yonly-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-gaussianblur-yonly-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-gaussianblur-yonly-expected.txt
index 4edac5d..86cdf6f5 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-gaussianblur-yonly-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-gaussianblur-yonly-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-lighting-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-lighting-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-lighting-expected.txt
index 85789946..792fc03 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-lighting-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-lighting-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-merge-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-merge-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-merge-expected.txt
index 0ce7279d..efcd45d 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-merge-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-merge-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-morphology-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-morphology-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-morphology-expected.txt
index bf443c8..9282a25e 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-morphology-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-morphology-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-morphology-xonly-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-morphology-xonly-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-morphology-xonly-expected.txt
index a6dfacdc..6cdf01b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-morphology-xonly-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-morphology-xonly-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-morphology-yonly-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-morphology-yonly-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-morphology-yonly-expected.txt
index 16e9519..a820beb 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-morphology-yonly-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-morphology-yonly-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-offset-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-offset-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-offset-expected.txt
index 255b4a7e..5dd814b9 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-offset-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-offset-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-primitive-attr-mutation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-primitive-attr-mutation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-primitive-attr-mutation-expected.txt
index d9f3e56d..72edcfd 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-primitive-attr-mutation-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-primitive-attr-mutation-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-primitive-attr-removal-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-primitive-attr-removal-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-primitive-attr-removal-expected.txt
index d9f3e56d..72edcfd 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-primitive-attr-removal-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-primitive-attr-removal-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-primitive-removed-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-primitive-removed-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-primitive-removed-expected.txt
index d9f3e56d..72edcfd 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-primitive-removed-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/effect-reference-repaint-primitive-removed-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/filter-invalidation-after-display-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/filter-invalidation-after-display-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/filter-invalidation-after-display-expected.txt
index e9cceb6c..92c8aa4 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/filter-invalidation-after-display-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/filter-invalidation-after-display-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/filter-invalidation-positioned-child-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/filter-invalidation-positioned-child-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/filter-invalidation-positioned-child-expected.txt
index b0a29976..8a37907 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/filter-invalidation-positioned-child-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/filter-invalidation-positioned-child-expected.txt
@@ -1,14 +1,24 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [12, 12, 630, 330],
-        [162, 162, 570, 270]
-      ]
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='box'",
+      "position": [12, 12],
+      "bounds": [135, 135],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='positioned'",
+      "position": [162, 162],
+      "bounds": [75, 75],
+      "contentsOpaque": true,
+      "backgroundColor": "#0000FF"
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/filter-invalidation-with-composited-container-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/filter-invalidation-with-composited-container-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/filter-invalidation-with-composited-container-change-expected.txt
index 811a09d..65452930 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/filter-invalidation-with-composited-container-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/filter-invalidation-with-composited-container-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/filter-on-html-element-with-fixed-position-child-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/filter-on-html-element-with-fixed-position-child-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/filter-on-html-element-with-fixed-position-child-expected.txt
index 2ef60b1d..3235a457 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/filter-on-html-element-with-fixed-position-child-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/filter-on-html-element-with-fixed-position-child-expected.txt
@@ -1,8 +1,16 @@
 {
   "layers": [
     {
-      "name": "LayoutNGBlockFlow HTML",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 15024],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "transform": 1
+    },
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 15024],
+      "contentsOpaqueForText": true,
       "transform": 1
     },
     {
@@ -20,10 +28,9 @@
       "transform": 3
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/filter-repaint-accelerated-child-with-filter-child-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/filter-repaint-accelerated-child-with-filter-child-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/filter-repaint-accelerated-child-with-filter-child-expected.txt
index a786d33..b04992e3 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/filter-repaint-accelerated-child-with-filter-child-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/filter-repaint-accelerated-child-with-filter-child-expected.txt
@@ -1,22 +1,24 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow DIV class='blur'",
+      "position": [12, 12],
       "bounds": [300, 300],
-      "transform": 1
+      "contentsOpaqueForText": true
     },
     {
       "name": "LayoutNGBlockFlow DIV class='accelerated'",
-      "position": [-18, -18],
-      "bounds": [318, 384],
+      "position": [-21, -21],
+      "bounds": [321, 390],
+      "contentsOpaqueForText": true,
       "invalidations": [
-        [0, 0, 318, 384]
+        [0, 0, 321, 390]
       ],
       "transform": 1
     }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/filter-repaint-accelerated-on-accelerated-filter-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/filter-repaint-accelerated-on-accelerated-filter-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/filter-repaint-accelerated-on-accelerated-filter-expected.txt
index 95b5863..3705fece 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/filter-repaint-accelerated-on-accelerated-filter-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/filter-repaint-accelerated-on-accelerated-filter-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,6 +9,7 @@
     {
       "name": "LayoutNGBlockFlow DIV class='blur accelerated'",
       "bounds": [300, 300],
+      "contentsOpaqueForText": true,
       "transform": 1
     },
     {

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/filter-repaint-on-accelerated-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/filter-repaint-on-accelerated-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/filter-repaint-on-accelerated-layer-expected.txt
index b5e3e0f..354d167 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/filter-repaint-on-accelerated-layer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/filters/filter-repaint-on-accelerated-layer-expected.txt
@@ -1,15 +1,16 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow DIV class='blur'",
+      "position": [12, 12],
       "bounds": [300, 300],
-      "transform": 1
+      "contentsOpaqueForText": true
     },
     {
       "name": "LayoutNGBlockFlow DIV id='resize' class='accelerated'",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-content-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-content-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-content-change-expected.txt
index 4665805..af38705d 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-content-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-content-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-content-change-keeping-geometry-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-content-change-keeping-geometry-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-content-change-keeping-geometry-expected.txt
index 7f87abd0..36ece76f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-content-change-keeping-geometry-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-content-change-keeping-geometry-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-content-change-no-flex-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-content-change-no-flex-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-content-change-no-flex-expected.txt
index 7f87abd0..36ece76f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-content-change-no-flex-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-content-change-no-flex-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-content-distribution-change-grid-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-content-distribution-change-grid-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-content-distribution-change-grid-expected.txt
index feefff3..e843e146 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-content-distribution-change-grid-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-content-distribution-change-grid-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-items-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-items-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-items-change-expected.txt
index 0e7bcc2..9cca095 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-items-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-items-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-self-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-self-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-self-change-expected.txt
index 0e7bcc2..9cca095 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-self-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-self-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-self-change-grid-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-self-change-grid-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-self-change-grid-expected.txt
index 611ee8b..a2e422a 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-self-change-grid-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-self-change-grid-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-self-change-keeping-geometry-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-self-change-keeping-geometry-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-self-change-keeping-geometry-expected.txt
index 7f87abd0..36ece76f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-self-change-keeping-geometry-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-self-change-keeping-geometry-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-self-change-keeping-geometry-grid-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-self-change-keeping-geometry-grid-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-self-change-keeping-geometry-grid-expected.txt
index 7f87abd0..36ece76f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-self-change-keeping-geometry-grid-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-self-change-keeping-geometry-grid-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-self-change-no-flex-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-self-change-no-flex-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-self-change-no-flex-expected.txt
index 7f87abd0..36ece76f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-self-change-no-flex-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/align-self-change-no-flex-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/justify-content-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/justify-content-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/justify-content-change-expected.txt
index e996960..c1bdd27 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/justify-content-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/justify-content-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/justify-content-distribution-change-grid-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/justify-content-distribution-change-grid-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/justify-content-distribution-change-grid-expected.txt
index e1fcaadfe..270d454c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/justify-content-distribution-change-grid-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/justify-content-distribution-change-grid-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/justify-items-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/justify-items-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/justify-items-change-expected.txt
index 7233e3a..b37f513b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/justify-items-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/justify-items-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/justify-items-legacy-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/justify-items-legacy-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/justify-items-legacy-change-expected.txt
index 546640b..961cfabb 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/justify-items-legacy-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/justify-items-legacy-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/justify-self-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/justify-self-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/justify-self-change-expected.txt
index ec5ec3ac..c039549 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/justify-self-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/justify-self-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/justify-self-change-keeping-geometry-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/justify-self-change-keeping-geometry-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/justify-self-change-keeping-geometry-expected.txt
index 7f87abd0..36ece76f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/justify-self-change-keeping-geometry-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/justify-self-change-keeping-geometry-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/remove-inline-block-descendant-of-flex-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/remove-inline-block-descendant-of-flex-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/remove-inline-block-descendant-of-flex-expected.txt
index b104ff7..85eaef1 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/remove-inline-block-descendant-of-flex-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/remove-inline-block-descendant-of-flex-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/repaint-column-reverse-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/repaint-column-reverse-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/repaint-column-reverse-expected.txt
index 1a04819c..1802ada 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/repaint-column-reverse-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/repaint-column-reverse-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/repaint-during-resize-no-flex-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/repaint-during-resize-no-flex-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/repaint-during-resize-no-flex-expected.txt
index 2036e37..8cf65b3 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/repaint-during-resize-no-flex-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/repaint-during-resize-no-flex-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/repaint-expected.txt
index 0a0737a..2f17581 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/repaint-on-layout-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/repaint-on-layout-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/repaint-on-layout-expected.txt
index 2eb9333..e82e121 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/repaint-on-layout-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/repaint-on-layout-expected.txt
@@ -1,13 +1,20 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "invalidations": [
         [1068, 12, 120, 30]
       ]
+    },
+    {
+      "name": "LayoutNGFlexibleBox (positioned) NAV class='nav-bar'",
+      "position": [12, 0],
+      "bounds": [300, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000"
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/repaint-on-margin-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/repaint-on-margin-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/repaint-on-margin-change-expected.txt
index 8f3ab05a..d7d4cbf 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/repaint-on-margin-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/repaint-on-margin-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/repaint-opacity-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/repaint-opacity-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/repaint-opacity-change-expected.txt
index 27c49781..7f021f9 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/repaint-opacity-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/repaint-opacity-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/repaint-rtl-column-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/repaint-rtl-column-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/repaint-rtl-column-expected.txt
index 443b79d..e5013c2d 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/repaint-rtl-column-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/repaint-rtl-column-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/scrollbars-changed-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/scrollbars-changed-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/scrollbars-changed-expected.txt
index c34c12e..4b5f809 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/scrollbars-changed-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/flexbox/scrollbars-changed-expected.txt
@@ -1,27 +1,28 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow DIV id='scroller'",
-      "bounds": [300, 150]
+      "bounds": [278, 150],
+      "drawsContent": false
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "position": [278, 0],
-      "bounds": [22, 150]
-    },
-    {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
       "bounds": [278, 315],
       "backgroundColor": "#80808080",
       "invalidations": [
         [0, 7, 23, 23]
       ]
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [278, 0],
+      "bounds": [22, 150]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/float-in-new-block-with-layout-delta-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/float-in-new-block-with-layout-delta-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/float-in-new-block-with-layout-delta-expected.txt
index 9f783e51..36605bc 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/float-in-new-block-with-layout-delta-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/float-in-new-block-with-layout-delta-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/float-move-during-layout-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/float-move-during-layout-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/float-move-during-layout-expected.txt
index acfc905..ac2a4f9 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/float-move-during-layout-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/float-move-during-layout-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/float-new-in-block-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/float-new-in-block-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/float-new-in-block-expected.txt
index d9f3e56d..72edcfd 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/float-new-in-block-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/float-new-in-block-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/float-offscreen-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/float-offscreen-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/float-offscreen-expected.txt
index 50ea71f3..f4aa80b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/float-offscreen-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/float-offscreen-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,23 +9,13 @@
     {
       "name": "LayoutNGBlockFlow DIV id='target'",
       "bounds": [1176, 450],
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "Horizontal Scrollbar Layer",
-      "position": [0, 450],
-      "bounds": [1176, 0],
-      "transform": 1
-    },
-    {
-      "name": "Vertical Scrollbar Layer",
-      "position": [1176, 0],
-      "bounds": [0, 450],
-      "transform": 1
-    },
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [1176, 1541],
+      "name": "LayoutNGBlockFlow DIV id='target'",
+      "bounds": [150, 1541],
+      "contentsOpaqueForText": true,
       "transform": 1
     }
   ],

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/button-checkbox-click-method-repaint-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/button-checkbox-click-method-repaint-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/button-checkbox-click-method-repaint-expected.png
index 2029285..7ba5cf5 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/button-checkbox-click-method-repaint-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/button-checkbox-click-method-repaint-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/button-checkbox-click-method-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/button-checkbox-click-method-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/button-checkbox-click-method-repaint-expected.txt
index 27e2f79f..67b7ae9 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/button-checkbox-click-method-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/button-checkbox-click-method-repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown-expected.png
index ea21462b..0f104853 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown-expected.txt
index c926c03..2792e93 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown-expected.txt
@@ -1,12 +1,12 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "invalidations": [
-        [11, 11, 78, 34]
+        [9, 9, 82, 38]
       ]
     }
   ]

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/details-marker-color-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/details-marker-color-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/details-marker-color-change-expected.txt
index 959d613..4cb5aa57 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/details-marker-color-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/details-marker-color-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/radio-focus-by-mouse-then-keydown-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/radio-focus-by-mouse-then-keydown-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/radio-focus-by-mouse-then-keydown-expected.png
index e8f5b9a..e92a80d7 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/radio-focus-by-mouse-then-keydown-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/radio-focus-by-mouse-then-keydown-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/radio-focus-by-mouse-then-keydown-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/radio-focus-by-mouse-then-keydown-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/radio-focus-by-mouse-then-keydown-expected.txt
index 3fd889d..66593f7c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/radio-focus-by-mouse-then-keydown-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/radio-focus-by-mouse-then-keydown-expected.txt
@@ -1,12 +1,12 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "invalidations": [
-        [14, 11, 30, 30]
+        [12, 9, 34, 34]
       ]
     }
   ]

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/range-focus-by-mouse-then-keydown-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/range-focus-by-mouse-then-keydown-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/range-focus-by-mouse-then-keydown-expected.png
index 1e6f728..ac5432ef 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/range-focus-by-mouse-then-keydown-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/range-focus-by-mouse-then-keydown-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/range-focus-by-mouse-then-keydown-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/range-focus-by-mouse-then-keydown-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/range-focus-by-mouse-then-keydown-expected.txt
index 4c58d7e..308315b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/range-focus-by-mouse-then-keydown-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/range-focus-by-mouse-then-keydown-expected.txt
@@ -1,12 +1,12 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "invalidations": [
-        [13, 13, 198, 28]
+        [11, 11, 202, 32]
       ]
     }
   ]

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/select-option-background-color-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/select-option-background-color-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/select-option-background-color-expected.txt
index 0b4647c..f2ff90e5 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/select-option-background-color-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/select-option-background-color-expected.txt
@@ -1,12 +1,11 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "invalidations": [
-        [21, 52, 22, 102],
         [2, 53, 19, 25]
       ]
     }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.png
index cb74520..62eba02 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.txt
index 5b06f9b..b763055 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.txt
@@ -1,12 +1,12 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "invalidations": [
-        [11, 11, 88, 34]
+        [9, 9, 92, 38]
       ]
     }
   ]

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/textarea-appearance-none-resize-handle-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/textarea-appearance-none-resize-handle-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/textarea-appearance-none-resize-handle-expected.txt
index 0bae7b66..ea54059 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/textarea-appearance-none-resize-handle-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/textarea-appearance-none-resize-handle-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/textarea-caret-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/textarea-caret-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/textarea-caret-expected.png
index 1562fcb1..8bf5af6 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/textarea-caret-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/textarea-caret-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/textarea-caret-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/textarea-caret-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/textarea-caret-expected.txt
index 1b675a2c..70f899c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/textarea-caret-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/textarea-caret-expected.txt
@@ -1,41 +1,34 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "invalidations": [
-        [12, 12, 271, 53]
+        [9, 9, 277, 59]
       ]
     },
     {
       "name": "LayoutNGTextControlMultiLine TEXTAREA id='editor'",
-      "position": [-1, -1],
-      "bounds": [273, 55],
-      "backgroundColor": "#FFFFFF",
+      "position": [2, 2],
+      "bounds": [268, 28],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "Scroll corner of LayoutNGTextControlMultiLine TEXTAREA id='editor'",
+      "position": [225, 7],
+      "bounds": [44, 44],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
       "invalidations": [
-        [0, 0, 273, 55]
+        [0, 0, 44, 44]
       ],
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
-      "position": [1, 30],
-      "bounds": [246, 22],
-      "transform": 1
-    },
-    {
-      "name": "Scroll Corner Layer",
-      "position": [247, 29],
-      "bounds": [22, 22],
-      "invalidations": [
-        [0, 0, 22, 22]
-      ],
-      "transform": 1
-    },
-    {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGTextControlMultiLine TEXTAREA id='editor'",
       "position": [2, 2],
       "bounds": [723, 28],
       "backgroundColor": "#FFFFFF",
@@ -45,11 +38,18 @@
       "transform": 2
     },
     {
-      "name": "Decoration Layer",
-      "position": [-1, -1],
-      "bounds": [273, 55],
+      "name": "HorizontalScrollbar",
+      "position": [1, 30],
+      "bounds": [246, 22],
+      "transform": 1
+    },
+    {
+      "name": "Scroll corner of LayoutNGTextControlMultiLine TEXTAREA id='editor'",
+      "position": [-3, -3],
+      "bounds": [277, 59],
+      "contentsOpaqueForText": true,
       "invalidations": [
-        [0, 0, 273, 55]
+        [0, 0, 277, 59]
       ],
       "transform": 1
     }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/textarea-resize-property-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/textarea-resize-property-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/textarea-resize-property-change-expected.txt
index ed2e6369..ee638f2 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/textarea-resize-property-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/textarea-resize-property-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/textarea-set-disabled-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/textarea-set-disabled-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/textarea-set-disabled-expected.txt
index 9ea1919..f135462 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/textarea-set-disabled-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/forms/textarea-set-disabled-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/gradients-em-stops-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/gradients-em-stops-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/gradients-em-stops-repaint-expected.txt
index ac352c169..d413b80 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/gradients-em-stops-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/gradients-em-stops-repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/iframe-display-block-to-display-none-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/iframe-display-block-to-display-none-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/iframe-display-block-to-display-none-expected.txt
index db27bc70..4291c60 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/iframe-display-block-to-display-none-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/iframe-display-block-to-display-none-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/iframe-display-none-to-display-block-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/iframe-display-none-to-display-block-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/iframe-display-none-to-display-block-expected.txt
index db27bc70..4291c60 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/iframe-display-none-to-display-block-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/iframe-display-none-to-display-block-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/iframe-rounding-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/iframe-rounding-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/iframe-rounding-expected.txt
index b6b7433b..5fd83a73 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/iframe-rounding-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/iframe-rounding-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/image/canvas-composite-repaint-by-all-imagesource-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/image/canvas-composite-repaint-by-all-imagesource-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/image/canvas-composite-repaint-by-all-imagesource-expected.txt
index 70a6c52..211d236 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/image/canvas-composite-repaint-by-all-imagesource-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/image/canvas-composite-repaint-by-all-imagesource-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 1397],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -55,24 +55,18 @@
     {
       "name": "LayoutVideo VIDEO id='video'",
       "bounds": [225, 90],
-      "drawsContent": false,
-      "transform": 1
-    },
-    {
-      "name": "ContentsLayer for LayoutVideo VIDEO id='video'",
-      "bounds": [225, 90],
       "transform": 1
     },
     {
       "name": "LayoutNGFlexibleBox DIV class='sizing-small phase-pre-ready state-no-source'",
       "bounds": [225, 90],
+      "contentsOpaqueForText": true,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/image/do-not-paint-below-image-baseline-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/image/do-not-paint-below-image-baseline-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/image/do-not-paint-below-image-baseline-expected.txt
index 51b65d7..c229820 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/image/do-not-paint-below-image-baseline-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/image/do-not-paint-below-image-baseline-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/image/image-resize-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/image/image-resize-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/image/image-resize-expected.txt
index efdcfcc..42a2b153 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/image/image-resize-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/image/image-resize-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/image/percent-size-image-resize-container-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/image/percent-size-image-resize-container-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/image/percent-size-image-resize-container-expected.txt
index efdcfcc..42a2b153 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/image/percent-size-image-resize-container-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/image/percent-size-image-resize-container-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/in-scaled-iframe-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/in-scaled-iframe-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/in-scaled-iframe-expected.txt
index ae7995a5..8bf6f0a 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/in-scaled-iframe-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/in-scaled-iframe-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 1236],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -10,10 +10,9 @@
       ]
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/inline-block-resize-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/inline-block-resize-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/inline-block-resize-expected.txt
index d9f3e56d..72edcfd 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/inline-block-resize-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/inline-block-resize-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/inline-color-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/inline-color-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/inline-color-change-expected.txt
index 041ba302..a23dc869 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/inline-color-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/inline-color-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/inline-reflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/inline-reflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/inline-reflow-expected.txt
index 0f54422c..fc0dbba 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/inline-reflow-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/inline-reflow-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/insert-frame-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/insert-frame-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/insert-frame-expected.txt
index 284b071..8c31e960 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/insert-frame-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/insert-frame-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/invalidate-caret-before-text-node-update-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/invalidate-caret-before-text-node-update-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/invalidate-caret-before-text-node-update-expected.png
index 4e561b3a..a800364 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/invalidate-caret-before-text-node-update-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/invalidate-caret-before-text-node-update-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/invalidate-caret-before-text-node-update-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/invalidate-caret-before-text-node-update-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/invalidate-caret-before-text-node-update-expected.txt
index 896799d..11b873cd 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/invalidate-caret-before-text-node-update-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/invalidate-caret-before-text-node-update-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/invalidate-descendants-when-receiving-paint-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/invalidate-descendants-when-receiving-paint-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/invalidate-descendants-when-receiving-paint-layer-expected.txt
index 55a98a344..b633dff 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/invalidate-descendants-when-receiving-paint-layer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/invalidate-descendants-when-receiving-paint-layer-expected.txt
@@ -1,30 +1,13 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "invalidations": [
         [14, 14, 150, 150]
       ]
-    },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV",
-      "contentsOpaque": true,
-      "drawsContent": false,
-      "transform": 1
-    }
-  ],
-  "transforms": [
-    {
-      "id": 1,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [12, 12, 0, 1]
-      ]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/invalidate-invisible-element-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/invalidate-invisible-element-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/invalidate-invisible-element-expected.txt
index aa68496..c91094b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/invalidate-invisible-element-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/invalidate-invisible-element-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt
index 36876d20..dfbbbcd 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 3525],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -11,10 +11,9 @@
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/invalidation-on-foreground-graphics-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/invalidation-on-foreground-graphics-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/invalidation-on-foreground-graphics-layer-expected.txt
index a6f13e0..e5e1ee0 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/invalidation-on-foreground-graphics-layer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/invalidation-on-foreground-graphics-layer-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,31 +9,40 @@
     {
       "name": "LayoutNGBlockFlow DIV",
       "bounds": [300, 300],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "LayoutNGBlockFlow DIV",
+      "bounds": [278, 278],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV",
+      "bounds": [450, 450],
+      "contentsOpaque": true,
+      "backgroundColor": "#D3D3D3",
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
       "position": [0, 278],
       "bounds": [278, 22],
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [278, 0],
       "bounds": [22, 278],
       "transform": 1
     },
     {
-      "name": "Scroll Corner Layer",
+      "name": "Scroll corner of LayoutNGBlockFlow DIV",
       "position": [278, 278],
       "bounds": [22, 22],
-      "transform": 1
-    },
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [450, 450],
       "contentsOpaque": true,
-      "backgroundColor": "#D3D3D3",
       "transform": 1
     },
     {
@@ -44,10 +53,13 @@
       "transform": 1
     },
     {
-      "name": "LayoutNGBlockFlow DIV (foreground) Layer",
-      "bounds": [450, 450],
+      "name": "LayoutNGBlockFlow DIV",
+      "position": [150, 150],
+      "bounds": [300, 300],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
       "invalidations": [
-        [150, 150, 300, 300]
+        [0, 0, 300, 300]
       ],
       "transform": 1
     }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/invalidation-with-zero-size-object-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/invalidation-with-zero-size-object-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/invalidation-with-zero-size-object-expected.txt
index 022b1e6..f6d414c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/invalidation-with-zero-size-object-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/invalidation-with-zero-size-object-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/invalidations-in-iframe-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/invalidations-in-iframe-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/invalidations-in-iframe-expected.txt
index a107b432..79b0019d 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/invalidations-in-iframe-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/invalidations-in-iframe-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -10,11 +10,6 @@
       ]
     },
     {
-      "name": "LayoutView #document",
-      "bounds": [450, 225],
-      "transform": 1
-    },
-    {
       "name": "LayoutNGBlockFlow DIV",
       "bounds": [150, 150],
       "contentsOpaque": true,

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/invisible-objects-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/invisible-objects-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/invisible-objects-expected.txt
index 7f87abd0..36ece76f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/invisible-objects-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/invisible-objects-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/layer-full-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/layer-full-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/layer-full-repaint-expected.txt
index d9f3e56d..72edcfd 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/layer-full-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/layer-full-repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/layer-hide-when-needs-layout-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/layer-hide-when-needs-layout-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/layer-hide-when-needs-layout-expected.txt
index d9f3e56d..72edcfd 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/layer-hide-when-needs-layout-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/layer-hide-when-needs-layout-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/layer-visibility-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/layer-visibility-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/layer-visibility-expected.txt
index b5823b4..1e6ef8b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/layer-visibility-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/layer-visibility-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-1-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-1-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-1-expected.txt
index 1e0f9bb..2ff79fdf 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-1-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-1-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-10-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-10-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-10-expected.txt
index d7150060..d75ed83e 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-10-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-10-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-2-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-2-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-2-expected.txt
index 5ffb4ee8..afeb2c3e 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-2-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-2-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-3-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-3-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-3-expected.txt
index ae5823a..8305178 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-3-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-3-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-4-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-4-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-4-expected.txt
index 2ced287..7ff533ed 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-4-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-4-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-5-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-5-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-5-expected.txt
index bb8d4d1..1ec9551 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-5-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-5-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-6-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-6-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-6-expected.txt
index 6dec61f1..16b5102 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-6-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-6-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-7-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-7-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-7-expected.txt
index c5b7baab..4e5a87b0 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-7-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-7-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-8-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-8-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-8-expected.txt
index b6d27687..decb8c47 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-8-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-8-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-9-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-9-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-9-expected.txt
index ddcc3a93..aad9eab 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-9-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/line-flow-with-floats-9-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -10,16 +10,16 @@
       ]
     },
     {
-      "name": "Scrolling Contents Layer",
+      "name": "VerticalScrollbar",
+      "position": [728, 0],
+      "bounds": [22, 900]
+    },
+    {
+      "name": "LayoutNGBlockFlow HTML",
       "bounds": [728, 906],
       "invalidations": [
         [0, 0, 728, 906]
       ]
-    },
-    {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "position": [728, 0],
-      "bounds": [22, 900]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/lines-with-layout-delta-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/lines-with-layout-delta-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/lines-with-layout-delta-expected.txt
index ff094db9..43d55b8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/lines-with-layout-delta-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/lines-with-layout-delta-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/list-marker-2-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/list-marker-2-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/list-marker-2-expected.txt
index 73a2485..6722ad458 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/list-marker-2-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/list-marker-2-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/make-children-non-inline-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/make-children-non-inline-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/make-children-non-inline-expected.txt
index 308e0b5..cf92def 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/make-children-non-inline-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/make-children-non-inline-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/mix-blend-mode-separate-stacking-context-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/mix-blend-mode-separate-stacking-context-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/mix-blend-mode-separate-stacking-context-expected.txt
index f29b2b9d..d5c7d6a 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/mix-blend-mode-separate-stacking-context-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/mix-blend-mode-separate-stacking-context-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multi-layout-one-frame-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multi-layout-one-frame-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multi-layout-one-frame-expected.txt
index 5314fef..207f49b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multi-layout-one-frame-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multi-layout-one-frame-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/column-float-under-stacked-inline-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/column-float-under-stacked-inline-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/column-float-under-stacked-inline-expected.png
index 1de5c5a..be5b2bfd 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/column-float-under-stacked-inline-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/column-float-under-stacked-inline-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/column-rules-fixed-height-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/column-rules-fixed-height-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/column-rules-fixed-height-expected.txt
index 954f2366..e11ab669 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/column-rules-fixed-height-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/column-rules-fixed-height-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-as-paint-container-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-as-paint-container-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-as-paint-container-expected.txt
index 9ecd2383..6aca60a 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-as-paint-container-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-as-paint-container-expected.txt
@@ -1,33 +1,17 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "LayoutBlockFlow DIV id='target'",
+      "name": "LayoutNGBlockFlow DIV id='target'",
       "bounds": [945, 270],
       "backfaceVisibility": "hidden",
       "invalidations": [
-        [487, 210, 451, 30],
-        [487, 150, 451, 30],
-        [487, 30, 451, 30],
-        [487, 0, 451, 30],
-        [0, 210, 450, 30],
-        [0, 30, 450, 30],
-        [487, 90, 421, 30],
-        [487, 180, 391, 30],
-        [0, 150, 390, 30],
-        [0, 180, 360, 30],
-        [487, 60, 331, 30],
-        [0, 120, 330, 30],
-        [0, 60, 330, 30],
-        [0, 0, 330, 30],
-        [0, 90, 300, 30],
-        [487, 120, 211, 30],
-        [0, 240, 180, 30]
+        [0, 0, 938, 270]
       ],
       "transform": 1
     }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-relpos-with-abspos-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-relpos-with-abspos-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-relpos-with-abspos-expected.txt
index f31a44e..ced0b14 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-relpos-with-abspos-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-relpos-with-abspos-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-repaint-expected.txt
index 772a5016..00eb86d 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-repaint-expected.txt
@@ -1,13 +1,13 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "invalidations": [
-        [351, 21, 450, 76],
-        [13, 14, 20, 84]
+        [351, 22, 450, 75],
+        [13, 15, 20, 83]
       ]
     }
   ]

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-resize-with-rule-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-resize-with-rule-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-resize-with-rule-expected.txt
index b80f492..1e48c52 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-resize-with-rule-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-resize-with-rule-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-with-abspos-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-with-abspos-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-with-abspos-expected.txt
index d20a3cbf..5cb5763c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-with-abspos-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-with-abspos-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-with-abspos-in-relpos-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-with-abspos-in-relpos-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-with-abspos-in-relpos-expected.txt
index 15bfcad..eb5e629 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-with-abspos-in-relpos-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-with-abspos-in-relpos-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-with-block-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-with-block-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-with-block-expected.txt
index 52f6cde..23acad97 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-with-block-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-with-block-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-with-inline-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-with-inline-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-with-inline-expected.txt
index 52f6cde..23acad97 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-with-inline-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-with-inline-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-with-overflowing-block-rl-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-with-overflowing-block-rl-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-with-overflowing-block-rl-expected.txt
index 1d2c53d..e2dd1ae 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-with-overflowing-block-rl-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-with-overflowing-block-rl-expected.txt
@@ -1,14 +1,12 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
-      "backgroundColor": "#008000",
+      "backgroundColor": "#FFFFFF",
       "invalidations": [
-        [12, 512, 750, 250],
-        [12, 262, 750, 250],
-        [12, 12, 750, 250]
+        [12, 12, 750, 750]
       ]
     }
   ]

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-with-relpos-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-with-relpos-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-with-relpos-expected.txt
index 15392ed..9061474 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-with-relpos-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-with-relpos-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-with-text-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-with-text-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-with-text-expected.txt
index 52f6cde..23acad97 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-with-text-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/multicol/multicol-with-text-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/non-text-link-invalidation-optimization-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/non-text-link-invalidation-optimization-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/non-text-link-invalidation-optimization-expected.txt
index c914811..f2b6d58e 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/non-text-link-invalidation-optimization-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/non-text-link-invalidation-optimization-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/offset-change-wrong-invalidation-with-float-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/offset-change-wrong-invalidation-with-float-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/offset-change-wrong-invalidation-with-float-expected.txt
index 9538fce..2145d4ff 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/offset-change-wrong-invalidation-with-float-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/offset-change-wrong-invalidation-with-float-expected.txt
@@ -1,30 +1,13 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "invalidations": [
         [72, 138, 60, 27]
       ]
-    },
-    {
-      "name": "LayoutInline (relative positioned) SPAN id='placeholder'",
-      "drawsContent": false,
-      "backfaceVisibility": "hidden",
-      "transform": 1
-    }
-  ],
-  "transforms": [
-    {
-      "id": 1,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [72, 63, 0, 1]
-      ]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/opacity-from-zero-to-non-zero-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/opacity-from-zero-to-non-zero-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/opacity-from-zero-to-non-zero-expected.txt
index d9f3e56d..72edcfd 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/opacity-from-zero-to-non-zero-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/opacity-from-zero-to-non-zero-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/border-outline-0-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/border-outline-0-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/border-outline-0-expected.txt
index 647cfcaf..2045c440 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/border-outline-0-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/border-outline-0-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/border-radius-with-outline-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/border-radius-with-outline-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/border-radius-with-outline-expected.txt
index b6ab7b25..ce1d342 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/border-radius-with-outline-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/border-radius-with-outline-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/focus-continuations-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/focus-continuations-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/focus-continuations-expected.txt
index 87694d3..81569738 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/focus-continuations-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/focus-continuations-expected.txt
@@ -1,12 +1,12 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "invalidations": [
-        [10, 130, 129, 34]
+        [8, 128, 133, 38]
       ]
     }
   ]

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/focus-enable-continuations-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/focus-enable-continuations-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/focus-enable-continuations-expected.png
index 5d82e29e..cdd73153 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/focus-enable-continuations-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/focus-enable-continuations-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/focus-enable-continuations-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/focus-enable-continuations-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/focus-enable-continuations-expected.txt
index 87694d3..81569738 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/focus-enable-continuations-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/focus-enable-continuations-expected.txt
@@ -1,12 +1,12 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "invalidations": [
-        [10, 130, 129, 34]
+        [8, 128, 133, 38]
       ]
     }
   ]

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/focus-ring-on-child-move-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/focus-ring-on-child-move-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/focus-ring-on-child-move-expected.txt
index 9a6c199..d2cf859 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/focus-ring-on-child-move-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/focus-ring-on-child-move-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/focus-ring-on-continuation-move-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/focus-ring-on-continuation-move-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/focus-ring-on-continuation-move-expected.txt
index 3347213e..dc0be75 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/focus-ring-on-continuation-move-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/focus-ring-on-continuation-move-expected.txt
@@ -1,13 +1,13 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "invalidations": [
-        [310, 346, 154, 154],
-        [10, 346, 154, 154]
+        [308, 344, 158, 158],
+        [8, 344, 158, 158]
       ]
     }
   ]

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/focus-ring-on-inline-continuation-move-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/focus-ring-on-inline-continuation-move-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/focus-ring-on-inline-continuation-move-expected.txt
index 0329a59..857eb4a7 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/focus-ring-on-inline-continuation-move-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/focus-ring-on-inline-continuation-move-expected.txt
@@ -1,13 +1,13 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "invalidations": [
-        [10, 10, 154, 159],
-        [10, 130, 154, 154]
+        [8, 8, 158, 163],
+        [8, 128, 158, 158]
       ]
     }
   ]

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/inline-outline-repaint-2-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/inline-outline-repaint-2-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/inline-outline-repaint-2-expected.txt
index dde2d74..4faad2dd 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/inline-outline-repaint-2-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/inline-outline-repaint-2-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/inline-outline-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/inline-outline-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/inline-outline-repaint-expected.txt
index a76783a..11bf0c5a 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/inline-outline-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/inline-outline-repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-add-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-add-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-add-repaint-expected.txt
index 5c4ce87..3ecf2463 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-add-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-add-repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-become-affected-by-descendant-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-become-affected-by-descendant-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-become-affected-by-descendant-expected.txt
index 0deee3b2..2e3a32a8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-become-affected-by-descendant-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-become-affected-by-descendant-expected.txt
@@ -1,12 +1,12 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "invalidations": [
-        [10, 10, 229, 154]
+        [8, 8, 233, 158]
       ]
     }
   ]

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-become-not-affected-by-descendant-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-become-not-affected-by-descendant-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-become-not-affected-by-descendant-expected.txt
index 0deee3b2..2e3a32a8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-become-not-affected-by-descendant-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-become-not-affected-by-descendant-expected.txt
@@ -1,12 +1,12 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "invalidations": [
-        [10, 10, 229, 154]
+        [8, 8, 233, 158]
       ]
     }
   ]

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-change-continuations-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-change-continuations-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-change-continuations-expected.txt
index 7f87abd0..36ece76f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-change-continuations-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-change-continuations-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-change-invalidation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-change-invalidation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-change-invalidation-expected.txt
index 66b282c..d9125e0 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-change-invalidation-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-change-invalidation-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-change-offset-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-change-offset-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-change-offset-expected.txt
index 5ae9df9a..79955f5 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-change-offset-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-change-offset-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-change-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-change-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-change-repaint-expected.txt
index 5c4ce87..3ecf2463 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-change-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-change-repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-change-vertical-rl-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-change-vertical-rl-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-change-vertical-rl-expected.txt
index 30721b0d..a35cb2d4 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-change-vertical-rl-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-change-vertical-rl-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1524, 878],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -11,10 +11,9 @@
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 878],
-      "bounds": [1200, 22],
-      "contentsOpaque": true
+      "bounds": [1200, 22]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-child-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-child-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-child-repaint-expected.txt
index e62762a..b43e5079 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-child-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-child-repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-containing-image-in-non-standard-mode-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-containing-image-in-non-standard-mode-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-containing-image-in-non-standard-mode-expected.txt
index 5caff05..f818203 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-containing-image-in-non-standard-mode-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-containing-image-in-non-standard-mode-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-continuations-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-continuations-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-continuations-expected.txt
index 97d3253..8fd5b51 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-continuations-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-continuations-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-current-color-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-current-color-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-current-color-expected.txt
index de53b4e2..3049d67d 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-current-color-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-current-color-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-inset-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-inset-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-inset-expected.txt
index 01c7312..795871ee 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-inset-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-inset-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-not-affected-by-descendant-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-not-affected-by-descendant-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-not-affected-by-descendant-expected.txt
index b3faa90..f8bdd4e0 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-not-affected-by-descendant-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-not-affected-by-descendant-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-repaint-glitch-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-repaint-glitch-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-repaint-glitch-expected.txt
index b571c3a1..dc5fa62 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-repaint-glitch-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-repaint-glitch-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-shrinking-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-shrinking-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-shrinking-expected.txt
index ecb0614e..b7a9f35 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-shrinking-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/outline/outline-shrinking-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/align-items-overflow-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/align-items-overflow-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/align-items-overflow-change-expected.txt
index d5efef62..48eaa05b8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/align-items-overflow-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/align-items-overflow-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/align-self-overflow-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/align-self-overflow-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/align-self-overflow-change-expected.txt
index d5efef62..48eaa05b8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/align-self-overflow-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/align-self-overflow-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/clipped-overflow-visible-subtree-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/clipped-overflow-visible-subtree-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/clipped-overflow-visible-subtree-expected.txt
index 2d5681d..58ce4334 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/clipped-overflow-visible-subtree-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/clipped-overflow-visible-subtree-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/composited-overflow-local-background-removed-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/composited-overflow-local-background-removed-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/composited-overflow-local-background-removed-expected.txt
index dbca1031..b83b03b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/composited-overflow-local-background-removed-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/composited-overflow-local-background-removed-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,31 +9,38 @@
     {
       "name": "LayoutNGBlockFlow DIV id='scroller'",
       "bounds": [300, 300],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "bounds": [278, 278],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
       "position": [0, 278],
-      "bounds": [278, 22],
+      "bounds": [300, 22],
+      "contentsOpaqueForText": true,
+      "invalidations": [
+        [0, 0, 278, 22]
+      ],
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [278, 0],
       "bounds": [22, 278],
       "transform": 1
     },
     {
-      "name": "Scroll Corner Layer",
-      "position": [278, 278],
-      "bounds": [22, 22],
-      "transform": 1
-    },
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [278, 525],
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "position": [0, 24],
+      "bounds": [278, 501],
       "invalidations": [
-        [0, 0, 278, 525]
+        [0, 0, 278, 501]
       ],
       "transform": 1
     }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/composited-overflow-with-borderbox-background-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/composited-overflow-with-borderbox-background-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/composited-overflow-with-borderbox-background-expected.txt
index 19ec5571..a4dfff55 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/composited-overflow-with-borderbox-background-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/composited-overflow-with-borderbox-background-expected.txt
@@ -1,41 +1,23 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF"
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 330, 330]
+      ]
     },
     {
       "name": "LayoutNGBlockFlow DIV id='scroller'",
-      "bounds": [330, 330],
-      "contentsOpaque": true,
-      "backgroundColor": "#008000",
-      "invalidations": [
-        [0, 0, 330, 330]
-      ],
+      "position": [15, 15],
+      "bounds": [278, 278],
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
-      "position": [15, 293],
-      "bounds": [278, 22],
-      "transform": 1
-    },
-    {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "position": [293, 15],
-      "bounds": [22, 278],
-      "transform": 1
-    },
-    {
-      "name": "Scroll Corner Layer",
-      "position": [293, 293],
-      "bounds": [22, 22],
-      "transform": 1
-    },
-    {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
       "position": [15, 15],
       "bounds": [278, 450],
       "contentsOpaque": true,
@@ -44,6 +26,19 @@
         [0, 0, 278, 450]
       ],
       "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [15, 293],
+      "bounds": [300, 22],
+      "contentsOpaqueForText": true,
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [293, 15],
+      "bounds": [22, 278],
+      "transform": 1
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/composited-overflow-with-local-background-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/composited-overflow-with-local-background-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/composited-overflow-with-local-background-expected.txt
index 9116935..bbfdce5 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/composited-overflow-with-local-background-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/composited-overflow-with-local-background-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,28 +9,18 @@
     {
       "name": "LayoutNGBlockFlow DIV id='scroller'",
       "bounds": [300, 300],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
-      "position": [0, 278],
-      "bounds": [278, 22],
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "bounds": [278, 278],
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "position": [278, 0],
-      "bounds": [22, 278],
-      "transform": 1
-    },
-    {
-      "name": "Scroll Corner Layer",
-      "position": [278, 278],
-      "bounds": [22, 22],
-      "transform": 1
-    },
-    {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
       "bounds": [278, 450],
       "contentsOpaque": true,
       "backgroundColor": "#008000",
@@ -38,6 +28,19 @@
         [0, 0, 278, 450]
       ],
       "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 278],
+      "bounds": [300, 22],
+      "contentsOpaqueForText": true,
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [278, 0],
+      "bounds": [22, 278],
+      "transform": 1
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/composited-overflow-with-negative-offset-outline-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/composited-overflow-with-negative-offset-outline-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/composited-overflow-with-negative-offset-outline-expected.txt
index d0596776..86ab06d 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/composited-overflow-with-negative-offset-outline-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/composited-overflow-with-negative-offset-outline-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,34 +9,40 @@
     {
       "name": "LayoutNGBlockFlow DIV id='scroller'",
       "bounds": [300, 300],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "bounds": [278, 278],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
       "position": [0, 278],
-      "bounds": [278, 22],
+      "bounds": [300, 22],
+      "contentsOpaqueForText": true,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [278, 0],
       "bounds": [22, 278],
       "transform": 1
     },
     {
-      "name": "Scroll Corner Layer",
-      "position": [278, 278],
-      "bounds": [22, 22],
-      "transform": 1
-    },
-    {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
       "bounds": [278, 450],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "Decoration Layer",
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
       "bounds": [300, 300],
+      "contentsOpaqueForText": true,
       "invalidations": [
         [0, 0, 300, 300]
       ],

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/composited-vertical-rl-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/composited-vertical-rl-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/composited-vertical-rl-overflow-expected.txt
index f1bfcbc..89ff461 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/composited-vertical-rl-overflow-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/composited-vertical-rl-overflow-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -10,6 +10,7 @@
       "name": "LayoutNGBlockFlow (positioned) DIV id='div'",
       "position": [-75, 0],
       "bounds": [225, 150],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#0000FF",
       "invalidations": [
         [0, 0, 225, 150]

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/content-into-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/content-into-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/content-into-overflow-expected.txt
index cda141c..3590d2e 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/content-into-overflow-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/content-into-overflow-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/erase-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/erase-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/erase-overflow-expected.txt
index 8350b9e..d7618ea 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/erase-overflow-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/erase-overflow-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/fixed-position-transparency-with-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/fixed-position-transparency-with-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/fixed-position-transparency-with-overflow-expected.txt
index 39211462..c7af9a9 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/fixed-position-transparency-with-overflow-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/fixed-position-transparency-with-overflow-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 3024],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -11,10 +11,29 @@
       ]
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "LayoutNGBlockFlow (relative positioned) DIV id='container' class='relative blue'",
+      "position": [12, 312],
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#0000FF",
+      "invalidations": [
+        [0, 0, 150, 150]
+      ]
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='absolute green'",
+      "position": [162, 462],
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "invalidations": [
+        [0, 0, 150, 150]
+      ]
+    },
+    {
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/float-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/float-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/float-overflow-expected.txt
index ad543ec..a8b2c41 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/float-overflow-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/float-overflow-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/float-overflow-right-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/float-overflow-right-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/float-overflow-right-expected.txt
index a7b0d45..c0aa3b4 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/float-overflow-right-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/float-overflow-right-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/inline-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/inline-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/inline-overflow-expected.txt
index 2400ec45..50a5a8b6 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/inline-overflow-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/inline-overflow-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/inline-vertical-lr-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/inline-vertical-lr-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/inline-vertical-lr-overflow-expected.txt
index aacd46bb..e6c1367 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/inline-vertical-lr-overflow-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/inline-vertical-lr-overflow-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/inline-vertical-rl-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/inline-vertical-rl-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/inline-vertical-rl-overflow-expected.txt
index d8565d4c..45ba85f4 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/inline-vertical-rl-overflow-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/inline-vertical-rl-overflow-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/justify-items-overflow-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/justify-items-overflow-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/justify-items-overflow-change-expected.txt
index d1a5d14..ff759db 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/justify-items-overflow-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/justify-items-overflow-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/justify-self-overflow-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/justify-self-overflow-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/justify-self-overflow-change-expected.txt
index 8253fef..a78f70a 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/justify-self-overflow-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/justify-self-overflow-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/line-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/line-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/line-overflow-expected.txt
index 419b6b3..c8f5f5c4 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/line-overflow-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/line-overflow-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/negative-text-indent-with-overflow-hidden-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/negative-text-indent-with-overflow-hidden-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/negative-text-indent-with-overflow-hidden-expected.txt
index d275e89..e0574d2e 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/negative-text-indent-with-overflow-hidden-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/negative-text-indent-with-overflow-hidden-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/opacity-change-on-overflow-float-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/opacity-change-on-overflow-float-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/opacity-change-on-overflow-float-expected.txt
index bee16de..cc7b3007 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/opacity-change-on-overflow-float-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/opacity-change-on-overflow-float-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/overflow-changed-on-child-of-composited-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/overflow-changed-on-child-of-composited-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/overflow-changed-on-child-of-composited-layer-expected.txt
index 5b6864b1..68afa37 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/overflow-changed-on-child-of-composited-layer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/overflow-changed-on-child-of-composited-layer-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -10,6 +10,7 @@
       "name": "LayoutNGBlockFlow DIV id='parent'",
       "position": [-15, -15],
       "bounds": [1131, 315],
+      "contentsOpaqueForText": true,
       "invalidations": [
         [0, 0, 180, 315],
         [315, 30, 150, 150],

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/overflow-clip-subtree-layout-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/overflow-clip-subtree-layout-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/overflow-clip-subtree-layout-expected.txt
index 7f87abd0..36ece76f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/overflow-clip-subtree-layout-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/overflow-clip-subtree-layout-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/overflow-delete-line-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/overflow-delete-line-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/overflow-delete-line-expected.txt
index b762a4b1..d44a9735 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/overflow-delete-line-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/overflow-delete-line-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/overflow-hide-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/overflow-hide-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/overflow-hide-expected.txt
index 3d67a265..b4bac83 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/overflow-hide-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/overflow-hide-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 3024],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -11,10 +11,9 @@
       ]
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/overflow-into-content-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/overflow-into-content-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/overflow-into-content-expected.txt
index cda141c..3590d2e 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/overflow-into-content-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/overflow-into-content-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/overflow-show-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/overflow-show-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/overflow-show-expected.txt
index 3d67a265..b4bac83 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/overflow-show-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/overflow-show-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 3024],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -11,10 +11,9 @@
       ]
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/rel-positioned-inline-with-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/rel-positioned-inline-with-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/rel-positioned-inline-with-overflow-expected.txt
index 25380e3..575e307c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/rel-positioned-inline-with-overflow-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/rel-positioned-inline-with-overflow-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/repaint-resized-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/repaint-resized-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/repaint-resized-overflow-expected.txt
index 53070e1..4d95cd8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/repaint-resized-overflow-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/repaint-resized-overflow-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/trailing-floats-root-line-box-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/trailing-floats-root-line-box-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/trailing-floats-root-line-box-overflow-expected.txt
index cadacf2..e6230c6f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/trailing-floats-root-line-box-overflow-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/trailing-floats-root-line-box-overflow-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/vertical-overflow-child-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/vertical-overflow-child-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/vertical-overflow-child-expected.txt
index 62a09e7f..5eea2b4f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/vertical-overflow-child-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/vertical-overflow-child-expected.txt
@@ -1,38 +1,36 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow DIV class='container'",
-      "bounds": [453, 303],
+      "position": [2, 2],
+      "bounds": [428, 278],
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [1, 280],
       "bounds": [428, 22],
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "position": [430, 1],
-      "bounds": [22, 278],
+      "name": "VerticalScrollbar",
+      "position": [429, 1],
+      "bounds": [23, 300],
+      "contentsOpaqueForText": true,
       "transform": 1
     },
     {
-      "name": "Scroll Corner Layer",
-      "position": [429, 279],
-      "bounds": [22, 22],
-      "transform": 1
-    },
-    {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow DIV class='container'",
       "position": [2, 2],
-      "bounds": [3150, 278],
+      "bounds": [3150, 150],
+      "contentsOpaqueForText": true,
       "invalidations": [
         [3000, 0, 150, 150]
       ],

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/vertical-overflow-parent-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/vertical-overflow-parent-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/vertical-overflow-parent-expected.txt
index 80e1754..bf259d6 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/vertical-overflow-parent-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/vertical-overflow-parent-expected.txt
@@ -1,38 +1,36 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow DIV class='container'",
-      "bounds": [453, 303],
+      "position": [2, 2],
+      "bounds": [428, 278],
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [1, 280],
       "bounds": [428, 22],
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "position": [430, 1],
-      "bounds": [22, 278],
+      "name": "VerticalScrollbar",
+      "position": [429, 1],
+      "bounds": [23, 300],
+      "contentsOpaqueForText": true,
       "transform": 1
     },
     {
-      "name": "Scroll Corner Layer",
-      "position": [429, 279],
-      "bounds": [22, 22],
-      "transform": 1
-    },
-    {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow DIV class='container'",
       "position": [2, 2],
-      "bounds": [3150, 278],
+      "bounds": [3150, 150],
+      "contentsOpaqueForText": true,
       "invalidations": [
         [0, 0, 150, 150]
       ],

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/vertical-overflow-same-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/vertical-overflow-same-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/vertical-overflow-same-expected.txt
index 5d8b0308..1193fbbe 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/vertical-overflow-same-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/vertical-overflow-same-expected.txt
@@ -1,38 +1,36 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow DIV class='vertical-rl container'",
-      "bounds": [453, 303],
+      "position": [2, 2],
+      "bounds": [428, 278],
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [1, 280],
       "bounds": [428, 22],
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "position": [430, 1],
-      "bounds": [22, 278],
+      "name": "VerticalScrollbar",
+      "position": [429, 1],
+      "bounds": [23, 300],
+      "contentsOpaqueForText": true,
       "transform": 1
     },
     {
-      "name": "Scroll Corner Layer",
-      "position": [429, 279],
-      "bounds": [22, 22],
-      "transform": 1
-    },
-    {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow DIV class='vertical-rl container'",
       "position": [2, 2],
-      "bounds": [3150, 278],
+      "bounds": [3150, 150],
+      "contentsOpaqueForText": true,
       "invalidations": [
         [0, 0, 150, 150]
       ],

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/vertical-rl-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/vertical-rl-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/vertical-rl-overflow-expected.txt
index 414c75b8..0c78de0c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/vertical-rl-overflow-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overflow/vertical-rl-overflow-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overhanging-float-detach-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overhanging-float-detach-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overhanging-float-detach-repaint-expected.txt
index 3840fda..4886ec2 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overhanging-float-detach-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/overhanging-float-detach-repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/paint-caret-in-div-with-negative-indent-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/paint-caret-in-div-with-negative-indent-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/paint-caret-in-div-with-negative-indent-expected.txt
index c020ca3..f871dbaf 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/paint-caret-in-div-with-negative-indent-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/paint-caret-in-div-with-negative-indent-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/paint-invalidation-with-opacity-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/paint-invalidation-with-opacity-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/paint-invalidation-with-opacity-expected.txt
index d9f3e56d..72edcfd 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/paint-invalidation-with-opacity-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/paint-invalidation-with-opacity-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/paint-invalidation-with-reparent-across-frame-boundaries-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/paint-invalidation-with-reparent-across-frame-boundaries-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/paint-invalidation-with-reparent-across-frame-boundaries-expected.txt
index 2c5fa4a4..eda07656 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/paint-invalidation-with-reparent-across-frame-boundaries-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/paint-invalidation-with-reparent-across-frame-boundaries-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/absolute-display-block-to-none-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/absolute-display-block-to-none-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/absolute-display-block-to-none-expected.txt
index fbf578d4..8717a5fb 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/absolute-display-block-to-none-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/absolute-display-block-to-none-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/absolute-margin-change-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/absolute-margin-change-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/absolute-margin-change-repaint-expected.txt
index 1587279..86398ff 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/absolute-margin-change-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/absolute-margin-change-repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/absolute-position-change-containing-block-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/absolute-position-change-containing-block-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/absolute-position-change-containing-block-expected.txt
index aeb9c3d..0ee7de5 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/absolute-position-change-containing-block-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/absolute-position-change-containing-block-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 3024],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -11,10 +11,9 @@
       ]
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/absolute-position-changed-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/absolute-position-changed-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/absolute-position-changed-expected.txt
index 6c4805d8..0e6bfb5 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/absolute-position-changed-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/absolute-position-changed-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 3024],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -24,16 +24,6 @@
         [0, 0, 150, 150]
       ],
       "transform": 1
-    },
-    {
-      "name": "Horizontal Scrollbar Layer",
-      "position": [0, 900],
-      "bounds": [1200, 0]
-    },
-    {
-      "name": "Vertical Scrollbar Layer",
-      "position": [1200, 0],
-      "bounds": [0, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/absolute-position-moved-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/absolute-position-moved-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/absolute-position-moved-expected.txt
index d33bee4..11c26b0 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/absolute-position-moved-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/absolute-position-moved-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 3024],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -10,31 +10,9 @@
       ]
     },
     {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='fixed red'",
-      "bounds": [150, 150],
-      "contentsOpaque": true,
-      "backgroundColor": "#FF0000",
-      "invalidations": [
-        [150, 150, 150, 150]
-      ],
-      "transform": 1
-    },
-    {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
-    }
-  ],
-  "transforms": [
-    {
-      "id": 1,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [12, 1500, 0, 1]
-      ]
+      "bounds": [22, 900]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/abspos-shift-image-incorrect-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/abspos-shift-image-incorrect-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/abspos-shift-image-incorrect-repaint-expected.txt
index 852e8f0..938d214 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/abspos-shift-image-incorrect-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/abspos-shift-image-incorrect-repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1875, 878],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -14,10 +14,9 @@
       ]
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 878],
-      "bounds": [1200, 22],
-      "contentsOpaque": true
+      "bounds": [1200, 22]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/align-content-position-change-grid-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/align-content-position-change-grid-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/align-content-position-change-grid-expected.txt
index 5caa3df..37288d7 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/align-content-position-change-grid-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/align-content-position-change-grid-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/background-position-no-image-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/background-position-no-image-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/background-position-no-image-expected.txt
index 7f87abd0..36ece76f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/background-position-no-image-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/background-position-no-image-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/block-layout-inline-children-float-positioned-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/block-layout-inline-children-float-positioned-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/block-layout-inline-children-float-positioned-expected.txt
index 2024ebd2..aa40f266 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/block-layout-inline-children-float-positioned-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/block-layout-inline-children-float-positioned-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/containing-block-position-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/containing-block-position-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/containing-block-position-change-expected.txt
index 533713f..89ac83f3 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/containing-block-position-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/containing-block-position-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/fixed-element-repaint-after-compositing-update-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/fixed-element-repaint-after-compositing-update-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/fixed-element-repaint-after-compositing-update-expected.txt
index 3b9f418..7f21e96 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/fixed-element-repaint-after-compositing-update-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/fixed-element-repaint-after-compositing-update-expected.txt
@@ -1,20 +1,20 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [225, 225, 150, 150],
-        [12, 153, 150, 150]
-      ]
+      "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "LayoutNGBlockFlow (positioned) DIV id='fixedTransformed'",
+      "name": "LayoutNGBlockFlow (positioned) DIV id='fixedOverlapping'",
       "position": [12, 153],
-      "contentsOpaque": true,
-      "drawsContent": false
+      "bounds": [1188, 747],
+      "contentsOpaqueForText": true,
+      "invalidations": [
+        [213, 72, 150, 150],
+        [0, 0, 150, 150]
+      ]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/fixed-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/fixed-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/fixed-expected.txt
index 689897c..cd1a744 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/fixed-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/fixed-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 3024],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -18,10 +18,9 @@
       "transform": 2
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/fixed-margin-change-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/fixed-margin-change-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/fixed-margin-change-repaint-expected.txt
index 1587279..b62c5dd9 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/fixed-margin-change-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/fixed-margin-change-repaint-expected.txt
@@ -1,13 +1,19 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='test'",
+      "position": [0, 90],
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
       "invalidations": [
-        [0, 90, 150, 150],
-        [0, 60, 150, 150]
+        [0, 0, 150, 150]
       ]
     }
   ]

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/fixed-to-relative-position-with-absolute-child-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/fixed-to-relative-position-with-absolute-child-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/fixed-to-relative-position-with-absolute-child-expected.txt
index 39211462..af2635cb 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/fixed-to-relative-position-with-absolute-child-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/fixed-to-relative-position-with-absolute-child-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 3024],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -11,10 +11,9 @@
       ]
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/fixed-tranformed-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/fixed-tranformed-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/fixed-tranformed-expected.txt
index fb320c2..b863309 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/fixed-tranformed-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/fixed-tranformed-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 1500],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -19,10 +19,9 @@
       "transform": 2
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/inline-relative-positioned-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/inline-relative-positioned-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/inline-relative-positioned-expected.txt
index ae47a95..cd165b5b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/inline-relative-positioned-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/inline-relative-positioned-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/intermediate-layout-position-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/intermediate-layout-position-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/intermediate-layout-position-expected.txt
index d7e1e50a..30b09ac 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/intermediate-layout-position-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/intermediate-layout-position-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/invalidate-paint-for-fixed-pos-inside-iframe-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/invalidate-paint-for-fixed-pos-inside-iframe-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/invalidate-paint-for-fixed-pos-inside-iframe-expected.txt
index 247fd67..1855870 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/invalidate-paint-for-fixed-pos-inside-iframe-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/invalidate-paint-for-fixed-pos-inside-iframe-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/justify-content-position-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/justify-content-position-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/justify-content-position-change-expected.txt
index 5ff18e38..85d12d2 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/justify-content-position-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/justify-content-position-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/justify-content-position-change-grid-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/justify-content-position-change-grid-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/justify-content-position-change-grid-expected.txt
index a27542d..06e7aff2 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/justify-content-position-change-grid-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/justify-content-position-change-grid-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/layout-state-only-positioned-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/layout-state-only-positioned-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/layout-state-only-positioned-expected.txt
index a7ffcb23..deaccaa 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/layout-state-only-positioned-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/layout-state-only-positioned-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -11,20 +11,24 @@
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV",
-      "bounds": [156, 156],
+      "position": [3, 3],
+      "bounds": [150, 150],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='q'",
+      "position": [3, 3],
+      "bounds": [15, 300],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
       "invalidations": [
-        [0, 0, 156, 156]
+        [0, 0, 15, 300]
       ],
       "transform": 1
     },
     {
-      "name": "Scrolling Contents Layer",
-      "position": [3, 3],
-      "bounds": [150, 300],
-      "transform": 1
-    },
-    {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [131, 3],
       "bounds": [22, 150],
       "transform": 1

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/layout-state-relative-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/layout-state-relative-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/layout-state-relative-expected.txt
index d741152..5f77e2b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/layout-state-relative-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/layout-state-relative-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/layoutstate-invalid-invalidation-inline-relative-positioned-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/layoutstate-invalid-invalidation-inline-relative-positioned-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/layoutstate-invalid-invalidation-inline-relative-positioned-expected.txt
index e1e144a..b134826 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/layoutstate-invalid-invalidation-inline-relative-positioned-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/layoutstate-invalid-invalidation-inline-relative-positioned-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/position-change-keeping-geometry-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/position-change-keeping-geometry-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/position-change-keeping-geometry-expected.txt
index 7f87abd0..238f8fc 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/position-change-keeping-geometry-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/position-change-keeping-geometry-expected.txt
@@ -1,10 +1,24 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF"
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [630, 30, 150, 150],
+        [330, 30, 150, 150]
+      ]
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='target3'",
+      "position": [630, 30],
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#0000FF",
+      "invalidations": [
+        [0, 0, 150, 150]
+      ]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/positioned-document-element-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/positioned-document-element-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/positioned-document-element-expected.txt
index be99d63..b8e5ab36 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/positioned-document-element-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/positioned-document-element-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#008000",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/positioned-great-grandparent-change-location-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/positioned-great-grandparent-change-location-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/positioned-great-grandparent-change-location-expected.txt
index d5ac7d1e..cfaeb36 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/positioned-great-grandparent-change-location-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/positioned-great-grandparent-change-location-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/positioned-list-offset-change-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/positioned-list-offset-change-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/positioned-list-offset-change-repaint-expected.txt
index eedb89ed..910ce2e 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/positioned-list-offset-change-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/positioned-list-offset-change-repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/relative-inline-positioned-movement-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/relative-inline-positioned-movement-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/relative-inline-positioned-movement-repaint-expected.txt
index a3c3d11..3c45479 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/relative-inline-positioned-movement-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/relative-inline-positioned-movement-repaint-expected.txt
@@ -1,18 +1,18 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutInline (relative positioned) DIV id='block'",
-      "position": [102, 11],
-      "bounds": [568, 29],
+      "position": [102, 10],
+      "bounds": [568, 30],
       "backfaceVisibility": "hidden",
       "invalidations": [
-        [0, 0, 568, 29]
+        [0, 0, 568, 30]
       ]
     }
   ]

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/relative-margin-change-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/relative-margin-change-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/relative-margin-change-repaint-expected.txt
index 1587279..86398ff 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/relative-margin-change-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/relative-margin-change-repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/relative-positioned-movement-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/relative-positioned-movement-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/relative-positioned-movement-repaint-expected.txt
index 6a661571..f1f6b27 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/relative-positioned-movement-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/relative-positioned-movement-repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/shift-relative-positioned-container-with-image-addition-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/shift-relative-positioned-container-with-image-addition-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/shift-relative-positioned-container-with-image-addition-expected.txt
index ab98b53..aa5453b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/shift-relative-positioned-container-with-image-addition-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/shift-relative-positioned-container-with-image-addition-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 1244],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -13,10 +13,9 @@
       ]
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/shift-relative-positioned-container-with-image-removal-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/shift-relative-positioned-container-with-image-removal-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/shift-relative-positioned-container-with-image-removal-expected.txt
index 4526558f..4fae0a8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/shift-relative-positioned-container-with-image-removal-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/shift-relative-positioned-container-with-image-removal-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 1103],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -12,10 +12,9 @@
       ]
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/static-to-positioned-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/static-to-positioned-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/static-to-positioned-expected.txt
index 55d6b1f8..4e9d72b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/static-to-positioned-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/static-to-positioned-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/text-in-relative-positioned-inline-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/text-in-relative-positioned-inline-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/text-in-relative-positioned-inline-expected.txt
index 8b2970679..7822c75 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/text-in-relative-positioned-inline-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/text-in-relative-positioned-inline-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/transform-absolute-child-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/transform-absolute-child-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/transform-absolute-child-expected.txt
index d031a31..30006f9 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/transform-absolute-child-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/transform-absolute-child-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/transform-absolute-in-positioned-container-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/transform-absolute-in-positioned-container-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/transform-absolute-in-positioned-container-expected.txt
index 86425c53..3d4ccda 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/transform-absolute-in-positioned-container-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/transform-absolute-in-positioned-container-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1203, 878],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -10,10 +10,9 @@
       ]
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 878],
-      "bounds": [1200, 22],
-      "contentsOpaque": true
+      "bounds": [1200, 22]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/transform-relative-position-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/transform-relative-position-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/transform-relative-position-expected.txt
index 2f2cb58..e92fdc23 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/transform-relative-position-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/position/transform-relative-position-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/push-block-with-first-line-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/push-block-with-first-line-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/push-block-with-first-line-expected.txt
index f7b22be..df55312 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/push-block-with-first-line-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/push-block-with-first-line-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/quotes-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/quotes-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/quotes-expected.txt
index 0fd2467..63446fe 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/quotes-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/quotes-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/raster-under-invalidation-checking-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/raster-under-invalidation-checking-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/raster-under-invalidation-checking-expected.txt
index a1fbc4d..7a68a8f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/raster-under-invalidation-checking-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/raster-under-invalidation-checking-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -938,29 +938,39 @@
     {
       "name": "LayoutNGBlockFlow DIV id='scroller'",
       "bounds": [225, 225],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
       "transform": 3
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "bounds": [203, 203],
+      "drawsContent": false,
+      "transform": 3
+    },
+    {
+      "name": "HorizontalScrollbar",
       "position": [0, 203],
       "bounds": [203, 22],
       "transform": 3
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [203, 0],
       "bounds": [22, 203],
       "transform": 3
     },
     {
-      "name": "Scroll Corner Layer",
+      "name": "Scroll corner of LayoutNGBlockFlow DIV id='scroller'",
       "position": [203, 203],
       "bounds": [22, 22],
+      "contentsOpaque": true,
       "transform": 3
     },
     {
-      "name": "Scrolling Contents Layer",
-      "bounds": [6000, 30090],
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "bounds": [6000, 30000],
+      "contentsOpaqueForText": true,
       "invalidations": [
         [60, 15015, 90, 60]
       ],

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/reflection/reflection-invalidation-after-display-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/reflection/reflection-invalidation-after-display-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/reflection/reflection-invalidation-after-display-expected.txt
index 3ba4e8b..4123209 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/reflection/reflection-invalidation-after-display-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/reflection/reflection-invalidation-after-display-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/reflection/reflection-invalidation-positioned-child-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/reflection/reflection-invalidation-positioned-child-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/reflection/reflection-invalidation-positioned-child-expected.txt
index 68d2732..e7f2e2d 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/reflection/reflection-invalidation-positioned-child-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/reflection/reflection-invalidation-positioned-child-expected.txt
@@ -1,14 +1,23 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [0, 0, 150, 330],
-        [600, 15, 75, 300]
-      ]
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='box'",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='positioned'",
+      "position": [600, 15],
+      "bounds": [75, 75],
+      "contentsOpaque": true,
+      "backgroundColor": "#0000FF"
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/reflection/reflection-redraw-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/reflection/reflection-redraw-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/reflection/reflection-redraw-expected.txt
index 72ee45f..29edeb3 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/reflection/reflection-redraw-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/reflection/reflection-redraw-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/reflection/reflection-with-rotation-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/reflection/reflection-with-rotation-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/reflection/reflection-with-rotation-expected.png
index addbb016..9140f3cf 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/reflection/reflection-with-rotation-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/reflection/reflection-with-rotation-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/reflection/reflection-with-rotation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/reflection/reflection-with-rotation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/reflection/reflection-with-rotation-expected.txt
index a116c75..73ae483 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/reflection/reflection-with-rotation-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/reflection/reflection-with-rotation-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/reflection/scroll-absolute-layer-with-reflection-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/reflection/scroll-absolute-layer-with-reflection-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/reflection/scroll-absolute-layer-with-reflection-expected.txt
index 449dbf03..10a49603 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/reflection/scroll-absolute-layer-with-reflection-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/reflection/scroll-absolute-layer-with-reflection-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 3024],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -11,10 +11,9 @@
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/reflection/scroll-fixed-layer-with-reflection-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/reflection/scroll-fixed-layer-with-reflection-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/reflection/scroll-fixed-layer-with-reflection-expected.txt
index 6b20b2a5..18d16958 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/reflection/scroll-fixed-layer-with-reflection-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/reflection/scroll-fixed-layer-with-reflection-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 3024],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -10,16 +10,16 @@
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='moveMe' class='fixed clipped'",
       "bounds": [150, 150],
+      "contentsOpaqueForText": true,
       "invalidations": [
         [0, 0, 150, 150]
       ],
       "transform": 2
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/reflection/scroll-fixed-reflected-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/reflection/scroll-fixed-reflected-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/reflection/scroll-fixed-reflected-layer-expected.txt
index d898f3b..67213d1 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/reflection/scroll-fixed-reflected-layer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/reflection/scroll-fixed-reflected-layer-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 3024],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -10,18 +10,16 @@
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='reflected fixed'",
       "bounds": [150, 150],
-      "contentsOpaque": true,
-      "backgroundColor": "#FF0000",
+      "contentsOpaqueForText": true,
       "invalidations": [
         [0, 0, 150, 150]
       ],
       "transform": 2
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/remove-block-after-layout-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/remove-block-after-layout-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/remove-block-after-layout-expected.txt
index 9f783e51..36605bc 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/remove-block-after-layout-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/remove-block-after-layout-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/remove-inline-after-layout-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/remove-inline-after-layout-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/remove-inline-after-layout-expected.txt
index 28040889..8bc37d5c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/remove-inline-after-layout-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/remove-inline-after-layout-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/remove-inline-layer-after-layout-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/remove-inline-layer-after-layout-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/remove-inline-layer-after-layout-expected.txt
index 28040889..8bc37d5c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/remove-inline-layer-after-layout-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/remove-inline-layer-after-layout-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/repaint-across-writing-mode-boundary-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/repaint-across-writing-mode-boundary-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/repaint-across-writing-mode-boundary-expected.txt
index 5838d06f2..4bcc4d2 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/repaint-across-writing-mode-boundary-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/repaint-across-writing-mode-boundary-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/repaint-descandant-on-ancestor-layer-move-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/repaint-descandant-on-ancestor-layer-move-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/repaint-descandant-on-ancestor-layer-move-expected.txt
index 097b950..728e6c79 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/repaint-descandant-on-ancestor-layer-move-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/repaint-descandant-on-ancestor-layer-move-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/repaint-in-iframe-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/repaint-in-iframe-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/repaint-in-iframe-expected.txt
index 247fd67..1855870 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/repaint-in-iframe-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/repaint-in-iframe-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/repaint-on-style-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/repaint-on-style-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/repaint-on-style-change-expected.txt
index 56edcf3..ae5f4be4a 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/repaint-on-style-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/repaint-on-style-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/repaint-overlay/layers-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/repaint-overlay/layers-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/repaint-overlay/layers-expected.txt
index 616cbd1b..9b512536 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/repaint-overlay/layers-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/repaint-overlay/layers-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 3024],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -10,6 +10,7 @@
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='container'",
       "bounds": [150, 150],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#0000FF80",
       "invalidations": [
         [30, 30, 15, 15]
@@ -19,18 +20,14 @@
     {
       "name": "LayoutNGBlockFlow (relative positioned) DIV id='scrollable'",
       "bounds": [453, 453],
+      "contentsOpaqueForText": true,
       "transform": 3
     },
     {
-      "name": "Horizontal Scrollbar Layer",
-      "position": [1, 452],
-      "bounds": [450, 0],
-      "transform": 3
-    },
-    {
-      "name": "Vertical Scrollbar Layer",
-      "position": [452, 1],
-      "bounds": [0, 450],
+      "name": "LayoutNGBlockFlow (relative positioned) DIV id='scrollable'",
+      "position": [2, 2],
+      "bounds": [450, 450],
+      "drawsContent": false,
       "transform": 3
     },
     {
@@ -42,11 +39,6 @@
         [30, 30, 15, 15]
       ],
       "transform": 6
-    },
-    {
-      "name": "Vertical Scrollbar Layer",
-      "position": [1200, 0],
-      "bounds": [0, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/repaint-subrect-grid-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/repaint-subrect-grid-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/repaint-subrect-grid-expected.txt
index d52bea0..18603bf3 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/repaint-subrect-grid-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/repaint-subrect-grid-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/requestAnimation-translation-leave-traces-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/requestAnimation-translation-leave-traces-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/requestAnimation-translation-leave-traces-expected.txt
index 0755738..5862eff 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/requestAnimation-translation-leave-traces-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/requestAnimation-translation-leave-traces-expected.txt
@@ -4,7 +4,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [2400, 878],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -15,10 +15,9 @@
       ]
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 878],
-      "bounds": [1200, 22],
-      "contentsOpaque": true
+      "bounds": [1200, 22]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/resize-iframe-text-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/resize-iframe-text-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/resize-iframe-text-expected.txt
index 209c940..575a623a7 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/resize-iframe-text-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/resize-iframe-text-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [500, 400],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -10,13 +10,13 @@
       ]
     },
     {
-      "name": "Scrolling Contents Layer",
-      "bounds": [478, 510]
-    },
-    {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [478, 0],
       "bounds": [22, 400]
+    },
+    {
+      "name": "LayoutNGBlockFlow HTML",
+      "bounds": [478, 510]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/ruby-flipped-blocks-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/ruby-flipped-blocks-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/ruby-flipped-blocks-expected.txt
index 146c7488..350ea3b1 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/ruby-flipped-blocks-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/ruby-flipped-blocks-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/caret-invalidation-in-overflow-scroll-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/caret-invalidation-in-overflow-scroll-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/caret-invalidation-in-overflow-scroll-expected.png
index 4392105ee..6ce2dc6 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/caret-invalidation-in-overflow-scroll-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/caret-invalidation-in-overflow-scroll-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/caret-invalidation-in-overflow-scroll-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/caret-invalidation-in-overflow-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/caret-invalidation-in-overflow-scroll-expected.txt
index 5d94ead4..f909fb9 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/caret-invalidation-in-overflow-scroll-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/caret-invalidation-in-overflow-scroll-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/caret-with-composited-scroll-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/caret-with-composited-scroll-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/caret-with-composited-scroll-expected.png
index f31bf61f1..6ccbf8a 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/caret-with-composited-scroll-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/caret-with-composited-scroll-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/caret-with-composited-scroll-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/caret-with-composited-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/caret-with-composited-scroll-expected.txt
index c13b472e..8ce5c3e 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/caret-with-composited-scroll-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/caret-with-composited-scroll-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,25 +9,22 @@
     {
       "name": "LayoutNGBlockFlow DIV id='scroller'",
       "bounds": [150, 150],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "Horizontal Scrollbar Layer",
-      "position": [0, 150],
-      "bounds": [150, 0],
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "bounds": [150, 150],
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "Vertical Scrollbar Layer",
-      "position": [150, 0],
-      "bounds": [0, 150],
-      "transform": 1
-    },
-    {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
       "bounds": [308, 1532],
+      "contentsOpaqueForText": true,
       "invalidations": [
-        [0, 1499, 308, 33]
+        [0, 1497, 308, 35]
       ],
       "transform": 2
     }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/composited-add-resizer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/composited-add-resizer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/composited-add-resizer-expected.txt
index 15a03215..242654c0 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/composited-add-resizer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/composited-add-resizer-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,26 +9,9 @@
     {
       "name": "LayoutNGBlockFlow DIV id='target'",
       "bounds": [150, 150],
-      "transform": 1
-    },
-    {
-      "name": "Horizontal Scrollbar Layer",
-      "position": [0, 128],
-      "bounds": [128, 22],
-      "transform": 1
-    },
-    {
-      "name": "Vertical Scrollbar Layer",
-      "position": [128, 0],
-      "bounds": [22, 128],
-      "transform": 1
-    },
-    {
-      "name": "Scroll Corner Layer",
-      "position": [128, 128],
-      "bounds": [22, 22],
+      "contentsOpaqueForText": true,
       "invalidations": [
-        [0, 0, 22, 22]
+        [128, 128, 22, 22]
       ],
       "transform": 1
     }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/composited-iframe-scroll-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/composited-iframe-scroll-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/composited-iframe-scroll-repaint-expected.txt
index 5d6f459b..54930b00 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/composited-iframe-scroll-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/composited-iframe-scroll-repaint-expected.txt
@@ -1,34 +1,24 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [450, 774],
-      "contentsOpaqueForText": true,
+      "contentsOpaque": true,
       "backgroundColor": "#EEEEEE",
       "transform": 2
     },
     {
       "name": "LayoutNGBlockFlow BODY",
       "bounds": [426, 750],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
       "transform": 3
-    },
-    {
-      "name": "Horizontal Scrollbar Layer",
-      "position": [0, 225],
-      "bounds": [450, 0],
-      "transform": 1
-    },
-    {
-      "name": "Vertical Scrollbar Layer",
-      "position": [450, 0],
-      "bounds": [0, 225],
-      "transform": 1
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/destroy-composited-scrollbar-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/destroy-composited-scrollbar-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/destroy-composited-scrollbar-expected.txt
index 3c37159c..502a430a 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/destroy-composited-scrollbar-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/destroy-composited-scrollbar-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/destroy-overlay-scrollbar-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/destroy-overlay-scrollbar-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/destroy-overlay-scrollbar-expected.txt
index 7f87abd0..36ece76f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/destroy-overlay-scrollbar-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/destroy-overlay-scrollbar-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/destroy-scrollbar-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/destroy-scrollbar-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/destroy-scrollbar-expected.txt
index 7f87abd0..36ece76f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/destroy-scrollbar-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/destroy-scrollbar-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/document-flipped-blocks-writing-mode-scroll-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/document-flipped-blocks-writing-mode-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/document-flipped-blocks-writing-mode-scroll-expected.txt
index a1e5ef8..658ea49d 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/document-flipped-blocks-writing-mode-scroll-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/document-flipped-blocks-writing-mode-scroll-expected.txt
@@ -1,16 +1,15 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [2274, 878],
       "contentsOpaque": true,
       "backgroundColor": "#ADD8E6"
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 878],
-      "bounds": [1200, 22],
-      "contentsOpaque": true
+      "bounds": [1200, 22]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-after-scroll-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-after-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-after-scroll-expected.txt
index 651fbbe..aa1d058 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-after-scroll-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-after-scroll-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 3024],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -25,10 +25,9 @@
       "transform": 3
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-and-absolute-position-scrolled-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-and-absolute-position-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-and-absolute-position-scrolled-expected.txt
index 40e8088..549d088 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-and-absolute-position-scrolled-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-and-absolute-position-scrolled-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 3024],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -26,10 +26,9 @@
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-child-move-after-scroll-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-child-move-after-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-child-move-after-scroll-expected.txt
index 151d581..a3273fb 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-child-move-after-scroll-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-child-move-after-scroll-expected.txt
@@ -1,18 +1,13 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 4524],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "transform": 1
     },
     {
-      "name": "LayoutNGBlockFlow (positioned) DIV id='fixedParent'",
-      "contentsOpaque": true,
-      "drawsContent": false
-    },
-    {
       "name": "LayoutNGBlockFlow (positioned) DIV id='toMove'",
       "bounds": [150, 150],
       "contentsOpaque": true,
@@ -23,10 +18,9 @@
       "transform": 2
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-child-of-fixed-move-after-scroll-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-child-of-fixed-move-after-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-child-of-fixed-move-after-scroll-expected.txt
index 151d581..a3273fb 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-child-of-fixed-move-after-scroll-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-child-of-fixed-move-after-scroll-expected.txt
@@ -1,18 +1,13 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 4524],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "transform": 1
     },
     {
-      "name": "LayoutNGBlockFlow (positioned) DIV id='fixedParent'",
-      "contentsOpaque": true,
-      "drawsContent": false
-    },
-    {
       "name": "LayoutNGBlockFlow (positioned) DIV id='toMove'",
       "bounds": [150, 150],
       "contentsOpaque": true,
@@ -23,10 +18,9 @@
       "transform": 2
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-child-of-transformed-move-after-scroll-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-child-of-transformed-move-after-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-child-of-transformed-move-after-scroll-expected.txt
index 7dba556..9d4de59 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-child-of-transformed-move-after-scroll-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-child-of-transformed-move-after-scroll-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 4524],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -12,10 +12,9 @@
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-child-of-transformed-scrolled-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-child-of-transformed-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-child-of-transformed-scrolled-expected.txt
index b03b08c..e0d2a53 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-child-of-transformed-scrolled-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-child-of-transformed-scrolled-expected.txt
@@ -1,37 +1,40 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='transformed'",
-      "bounds": [450, 450],
+      "bounds": [428, 428],
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 428],
       "bounds": [428, 22],
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [428, 0],
       "bounds": [22, 428],
       "transform": 1
     },
     {
-      "name": "Scroll Corner Layer",
+      "name": "Scroll corner of LayoutNGBlockFlow (positioned) DIV id='transformed'",
       "position": [428, 428],
       "bounds": [22, 22],
+      "contentsOpaque": true,
       "transform": 1
     },
     {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow (positioned) DIV id='transformed'",
       "bounds": [1500, 1500],
+      "contentsOpaqueForText": true,
       "invalidations": [
         [150, 225, 150, 150]
       ],

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-descendant-of-transformed-scrolled-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-descendant-of-transformed-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-descendant-of-transformed-scrolled-expected.txt
index 032113b5..5461dc3 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-descendant-of-transformed-scrolled-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-descendant-of-transformed-scrolled-expected.txt
@@ -1,39 +1,43 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='transformed'",
-      "bounds": [450, 450],
+      "bounds": [428, 428],
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 428],
       "bounds": [428, 22],
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [428, 0],
       "bounds": [22, 428],
       "transform": 1
     },
     {
-      "name": "Scroll Corner Layer",
+      "name": "Scroll corner of LayoutNGBlockFlow (positioned) DIV id='transformed'",
       "position": [428, 428],
       "bounds": [22, 22],
+      "contentsOpaque": true,
       "transform": 1
     },
     {
-      "name": "Scrolling Contents Layer",
-      "bounds": [1575, 1575],
+      "name": "LayoutNGBlockFlow (relative positioned) DIV id='relative'",
+      "position": [75, 75],
+      "bounds": [1500, 1500],
+      "contentsOpaqueForText": true,
       "invalidations": [
-        [150, 225, 150, 150]
+        [75, 150, 150, 150]
       ],
       "transform": 2
     }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-img-src-change-after-scroll-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-img-src-change-after-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-img-src-change-after-scroll-expected.txt
index ddada245..f956c57 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-img-src-change-after-scroll-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-img-src-change-after-scroll-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 3024],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -10,13 +10,13 @@
     {
       "name": "LayoutImage (positioned) IMG id='img'",
       "bounds": [150, 150],
+      "contentsOpaqueForText": true,
       "transform": 2
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-move-after-scroll-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-move-after-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-move-after-scroll-expected.txt
index 628007c..a3273fb 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-move-after-scroll-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-move-after-scroll-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 4524],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -18,10 +18,9 @@
       "transform": 2
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-scroll-simple-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-scroll-simple-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-scroll-simple-expected.txt
index 244fefe..0269158 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-scroll-simple-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-scroll-simple-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 3024],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -15,10 +15,9 @@
       "transform": 2
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-scroll-viewport-scroll-hidden-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-scroll-viewport-scroll-hidden-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-scroll-viewport-scroll-hidden-expected.txt
index dd1d51ad..58d56eda1 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-scroll-viewport-scroll-hidden-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-scroll-viewport-scroll-hidden-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 3024],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-under-composited-absolute-scrolled-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-under-composited-absolute-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-under-composited-absolute-scrolled-expected.txt
index db57a14..73f9e5c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-under-composited-absolute-scrolled-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-under-composited-absolute-scrolled-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 3002],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -25,10 +25,9 @@
       ]
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-with-border-under-composited-absolute-scrolled-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-with-border-under-composited-absolute-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-with-border-under-composited-absolute-scrolled-expected.txt
index f2cae312..60c11ae 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-with-border-under-composited-absolute-scrolled-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/fixed-with-border-under-composited-absolute-scrolled-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 3002],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -25,10 +25,9 @@
       ]
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/flipped-blocks-writing-mode-scroll-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/flipped-blocks-writing-mode-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/flipped-blocks-writing-mode-scroll-expected.txt
index b112210..f6c2c6f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/flipped-blocks-writing-mode-scroll-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/flipped-blocks-writing-mode-scroll-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,17 +9,26 @@
     {
       "name": "LayoutNGBlockFlow DIV id='scroller'",
       "bounds": [600, 600],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "bounds": [600, 578],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
       "position": [0, 578],
       "bounds": [600, 22],
       "transform": 1
     },
     {
-      "name": "Scrolling Contents Layer",
-      "bounds": [15000, 578],
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "bounds": [15000, 300],
+      "contentsOpaque": true,
       "backgroundColor": "#008000",
       "invalidations": [
         [0, 0, 15000, 300]

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/iframe-gradient-background-scroll-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/iframe-gradient-background-scroll-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/iframe-gradient-background-scroll-repaint-expected.txt
index 31a07b6..5b2950c3 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/iframe-gradient-background-scroll-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/iframe-gradient-background-scroll-repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/iframe-scroll-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/iframe-scroll-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/iframe-scroll-repaint-expected.txt
index 7f87abd0..36ece76f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/iframe-scroll-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/iframe-scroll-repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/iframe-scrollbar-hover-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/iframe-scrollbar-hover-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/iframe-scrollbar-hover-expected.txt
index 6dd670d4..ac2fe30 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/iframe-scrollbar-hover-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/iframe-scrollbar-hover-expected.txt
@@ -1,20 +1,22 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "Scrolling Contents Layer",
-      "bounds": [278, 474],
+      "name": "VerticalScrollbar",
+      "position": [278, 0],
+      "bounds": [22, 300],
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "position": [278, 0],
-      "bounds": [22, 300],
+      "name": "LayoutNGBlockFlow HTML",
+      "bounds": [278, 474],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
       "transform": 1
     }
   ],

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/inline-style-change-in-scrolled-view-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/inline-style-change-in-scrolled-view-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/inline-style-change-in-scrolled-view-expected.txt
index c83c8be..8acbd8a 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/inline-style-change-in-scrolled-view-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/inline-style-change-in-scrolled-view-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [3000, 3000],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -11,21 +11,20 @@
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 878],
-      "bounds": [1178, 22],
-      "contentsOpaque": true
+      "bounds": [1178, 22]
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 878],
-      "contentsOpaque": true
+      "bounds": [22, 878]
     },
     {
-      "name": "Scroll Corner Layer",
+      "name": "Scroll corner of LayoutView #document",
       "position": [1178, 878],
-      "bounds": [22, 22]
+      "bounds": [22, 22],
+      "contentsOpaque": true
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/invalidate-after-composited-scroll-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/invalidate-after-composited-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/invalidate-after-composited-scroll-expected.txt
index 23693ae..24722c87 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/invalidate-after-composited-scroll-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/invalidate-after-composited-scroll-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,17 +9,26 @@
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='scroller'",
       "bounds": [300, 300],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "LayoutNGBlockFlow (positioned) DIV id='scroller'",
+      "bounds": [278, 300],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
       "position": [278, 0],
       "bounds": [22, 300],
       "transform": 1
     },
     {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow (positioned) DIV id='scroller'",
       "bounds": [278, 7350],
+      "contentsOpaqueForText": true,
       "invalidations": [
         [0, 3600, 150, 150]
       ],

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/invalidate-after-composited-scroll-of-window-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/invalidate-after-composited-scroll-of-window-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/invalidate-after-composited-scroll-of-window-expected.txt
index 5e9e11cd..1494cfa9 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/invalidate-after-composited-scroll-of-window-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/invalidate-after-composited-scroll-of-window-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 7401],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -12,10 +12,9 @@
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/invalidate-caret-in-composited-scrolling-container-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/invalidate-caret-in-composited-scrolling-container-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/invalidate-caret-in-composited-scrolling-container-expected.txt
index a3e2d16..0aa095d 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/invalidate-caret-in-composited-scrolling-container-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/invalidate-caret-in-composited-scrolling-container-expected.txt
@@ -1,18 +1,19 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGTextControlSingleLine INPUT id='root'",
-      "position": [-1, -1],
-      "bounds": [97, 34],
+      "position": [-3, -3],
+      "bounds": [101, 38],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#FFFFFF",
       "invalidations": [
-        [0, 0, 97, 34]
+        [0, 0, 101, 38]
       ],
       "transform": 1
     }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/invalidate-caret-in-non-composited-scrolling-container-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/invalidate-caret-in-non-composited-scrolling-container-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/invalidate-caret-in-non-composited-scrolling-container-expected.txt
index a3e2d16..0aa095d 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/invalidate-caret-in-non-composited-scrolling-container-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/invalidate-caret-in-non-composited-scrolling-container-expected.txt
@@ -1,18 +1,19 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGTextControlSingleLine INPUT id='root'",
-      "position": [-1, -1],
-      "bounds": [97, 34],
+      "position": [-3, -3],
+      "bounds": [101, 38],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#FFFFFF",
       "invalidations": [
-        [0, 0, 97, 34]
+        [0, 0, 101, 38]
       ],
       "transform": 1
     }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/layout-state-scrolloffset-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/layout-state-scrolloffset-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/layout-state-scrolloffset-expected.txt
index 47b59577..6895bb6 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/layout-state-scrolloffset-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/layout-state-scrolloffset-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/layout-state-scrolloffset2-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/layout-state-scrolloffset2-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/layout-state-scrolloffset2-expected.txt
index b9d1d4f..452e8c5 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/layout-state-scrolloffset2-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/layout-state-scrolloffset2-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/layout-state-scrolloffset3-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/layout-state-scrolloffset3-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/layout-state-scrolloffset3-expected.txt
index be31e97..7ee558a1 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/layout-state-scrolloffset3-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/layout-state-scrolloffset3-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/line-in-scrolled-clipped-block-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/line-in-scrolled-clipped-block-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/line-in-scrolled-clipped-block-expected.txt
index a42c3b6..d6bf520 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/line-in-scrolled-clipped-block-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/line-in-scrolled-clipped-block-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/nested-fixed-iframe-scrolled-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/nested-fixed-iframe-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/nested-fixed-iframe-scrolled-expected.txt
index 1b8db76..54496747c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/nested-fixed-iframe-scrolled-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/nested-fixed-iframe-scrolled-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 3024],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -11,10 +11,9 @@
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/outline-change-in-scrollers-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/outline-change-in-scrollers-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/outline-change-in-scrollers-expected.txt
index 1b39e10..e0116548 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/outline-change-in-scrollers-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/outline-change-in-scrollers-expected.txt
@@ -1,73 +1,73 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='scroll'",
+      "position": [15, 15],
+      "bounds": [143, 143],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [15, 158],
+      "bounds": [143, 22],
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [158, 15],
+      "bounds": [22, 143],
+      "transform": 1
+    },
+    {
+      "name": "Scroll corner of LayoutNGBlockFlow (relative positioned) DIV class='scroll'",
+      "position": [170, 12],
+      "bounds": [439, 195],
+      "contentsOpaqueForText": true
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='scroll'",
+      "position": [15, 15],
+      "bounds": [225, 225],
+      "contentsOpaqueForText": true,
       "invalidations": [
-        [259, 259, 112, 112]
+        [0, 0, 113, 113]
+      ],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='scroll'",
+      "position": [15, 15],
+      "bounds": [143, 143],
+      "drawsContent": false,
+      "transform": 2
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [213, 170],
+      "bounds": [195, 238],
+      "contentsOpaqueForText": true,
+      "invalidations": [
+        [46, 89, 112, 112]
       ]
     },
     {
-      "name": "LayoutNGBlockFlow (relative positioned) DIV class='scroll'",
-      "bounds": [195, 195],
-      "transform": 1
-    },
-    {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
-      "position": [15, 158],
-      "bounds": [143, 22],
-      "transform": 1
-    },
-    {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "position": [158, 15],
-      "bounds": [22, 143],
-      "transform": 1
-    },
-    {
-      "name": "Scroll Corner Layer",
-      "position": [158, 158],
-      "bounds": [22, 22],
-      "transform": 1
-    },
-    {
-      "name": "Scrolling Contents Layer",
-      "position": [15, 15],
-      "bounds": [225, 225],
-      "invalidations": [
-        [0, 0, 113, 113]
-      ],
-      "transform": 1
-    },
-    {
-      "name": "LayoutNGBlockFlow (relative positioned) DIV class='scroll'",
-      "bounds": [195, 195],
-      "transform": 2
-    },
-    {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
-      "position": [15, 158],
-      "bounds": [143, 22],
-      "transform": 2
-    },
-    {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [158, 15],
       "bounds": [22, 143],
       "transform": 2
     },
     {
-      "name": "Scroll Corner Layer",
-      "position": [158, 158],
-      "bounds": [22, 22],
-      "transform": 2
-    },
-    {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='scroll'",
       "position": [15, 15],
       "bounds": [143, 225],
+      "contentsOpaqueForText": true,
       "invalidations": [
         [31, 0, 112, 113]
       ],
@@ -75,31 +75,34 @@
     },
     {
       "name": "LayoutNGBlockFlow (relative positioned) DIV class='scroll'",
-      "bounds": [195, 195],
+      "position": [15, 15],
+      "bounds": [143, 143],
+      "drawsContent": false,
       "transform": 3
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [15, 158],
       "bounds": [143, 22],
       "transform": 3
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [158, 15],
       "bounds": [22, 143],
       "transform": 3
     },
     {
-      "name": "Scroll Corner Layer",
-      "position": [158, 158],
-      "bounds": [22, 22],
-      "transform": 3
+      "name": "Scroll corner of LayoutNGBlockFlow (relative positioned) DIV class='scroll'",
+      "position": [414, 170],
+      "bounds": [195, 238],
+      "contentsOpaqueForText": true
     },
     {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='scroll'",
       "position": [15, 15],
       "bounds": [225, 225],
+      "contentsOpaqueForText": true,
       "invalidations": [
         [0, 0, 113, 113]
       ],
@@ -107,31 +110,28 @@
     },
     {
       "name": "LayoutNGBlockFlow (relative positioned) DIV class='scroll'",
-      "bounds": [195, 195],
+      "position": [37, 15],
+      "bounds": [143, 143],
+      "drawsContent": false,
       "transform": 4
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
-      "position": [37, 158],
-      "bounds": [143, 22],
-      "transform": 4
+      "name": "HorizontalScrollbar",
+      "position": [27, 371],
+      "bounds": [366, 22],
+      "contentsOpaqueForText": true
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [15, 15],
       "bounds": [22, 143],
       "transform": 4
     },
     {
-      "name": "Scroll Corner Layer",
-      "position": [15, 158],
-      "bounds": [22, 22],
-      "transform": 4
-    },
-    {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='scroll'",
       "position": [37, 15],
       "bounds": [143, 225],
+      "contentsOpaqueForText": true,
       "invalidations": [
         [31, 0, 112, 113]
       ],
@@ -139,31 +139,29 @@
     },
     {
       "name": "LayoutNGBlockFlow (relative positioned) DIV class='scroll'",
-      "bounds": [195, 195],
+      "position": [15, 15],
+      "bounds": [143, 143],
+      "drawsContent": false,
       "transform": 5
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [15, 158],
       "bounds": [143, 22],
       "transform": 5
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [158, 15],
-      "bounds": [22, 143],
+      "bounds": [22, 165],
+      "contentsOpaqueForText": true,
       "transform": 5
     },
     {
-      "name": "Scroll Corner Layer",
-      "position": [158, 158],
-      "bounds": [22, 22],
-      "transform": 5
-    },
-    {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='scroll'",
       "position": [15, 15],
       "bounds": [225, 143],
+      "contentsOpaqueForText": true,
       "invalidations": [
         [0, 31, 113, 112]
       ],

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/outline-change-scrollable-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/outline-change-scrollable-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/outline-change-scrollable-expected.txt
index 00781a3..417a7b9fa 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/outline-change-scrollable-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/outline-change-scrollable-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1512, 878],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -10,10 +10,9 @@
       ]
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 878],
-      "bounds": [1200, 22],
-      "contentsOpaque": true
+      "bounds": [1200, 22]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-auto-in-overflow-auto-scrolled-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-auto-in-overflow-auto-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-auto-in-overflow-auto-scrolled-expected.txt
index 67560bf..561098f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-auto-in-overflow-auto-scrolled-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-auto-in-overflow-auto-scrolled-expected.txt
@@ -1,41 +1,46 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow DIV id='outerDiv'",
-      "bounds": [1176, 450],
+      "bounds": [1154, 450],
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1154, 0],
       "bounds": [22, 450],
       "transform": 1
     },
     {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow DIV id='outerDiv'",
       "bounds": [1154, 1050],
+      "contentsOpaqueForText": true,
       "transform": 2
     },
     {
       "name": "LayoutNGBlockFlow DIV id='innerDiv'",
-      "bounds": [1154, 600],
+      "bounds": [1132, 600],
+      "drawsContent": false,
       "transform": 3
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1132, 0],
       "bounds": [22, 600],
       "transform": 3
     },
     {
-      "name": "Scrolling Contents Layer",
-      "bounds": [1132, 1200],
+      "name": "LayoutNGBlockFlow DIV id='innerDiv'",
+      "bounds": [450, 1200],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
       "transform": 4
     }
   ],

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-hidden-in-overflow-hidden-scrolled-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-hidden-in-overflow-hidden-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-hidden-in-overflow-hidden-scrolled-expected.txt
index 254b02a6..c339e4ca4 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-hidden-in-overflow-hidden-scrolled-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-hidden-in-overflow-hidden-scrolled-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-hidden-yet-scrolled-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-hidden-yet-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-hidden-yet-scrolled-expected.txt
index 0be3211..3921d09b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-hidden-yet-scrolled-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-hidden-yet-scrolled-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,6 +9,7 @@
     {
       "name": "LayoutNGBlockFlow DIV id='scroller'",
       "bounds": [453, 453],
+      "contentsOpaqueForText": true,
       "backfaceVisibility": "hidden",
       "invalidations": [
         [2, 302, 150, 150]

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-hidden-yet-scrolled-with-custom-scrollbar-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-hidden-yet-scrolled-with-custom-scrollbar-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-hidden-yet-scrolled-with-custom-scrollbar-expected.txt
index 0be3211..3921d09b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-hidden-yet-scrolled-with-custom-scrollbar-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-hidden-yet-scrolled-with-custom-scrollbar-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,6 +9,7 @@
     {
       "name": "LayoutNGBlockFlow DIV id='scroller'",
       "bounds": [453, 453],
+      "contentsOpaqueForText": true,
       "backfaceVisibility": "hidden",
       "invalidations": [
         [2, 302, 150, 150]

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-move-after-scroll-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-move-after-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-move-after-scroll-expected.txt
index 262849a9..b70aa80 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-move-after-scroll-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-move-after-scroll-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,29 +9,33 @@
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='scroller' class='scroller'",
       "bounds": [1050, 600],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "LayoutNGBlockFlow (positioned) DIV id='scroller' class='scroller'",
+      "bounds": [1028, 578],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
       "position": [0, 578],
-      "bounds": [1028, 22],
+      "bounds": [1050, 22],
+      "contentsOpaqueForText": true,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1028, 0],
       "bounds": [22, 578],
       "transform": 1
     },
     {
-      "name": "Scroll Corner Layer",
-      "position": [1028, 578],
-      "bounds": [22, 22],
-      "transform": 1
-    },
-    {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow (positioned) DIV id='scroller' class='scroller'",
       "bounds": [1028, 900],
+      "contentsOpaqueForText": true,
       "invalidations": [
         [450, 300, 180, 75],
         [75, 300, 180, 75]

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-scroll-after-move-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-scroll-after-move-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-scroll-after-move-expected.txt
index a8696e4..2d40e2a 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-scroll-after-move-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-scroll-after-move-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,29 +9,33 @@
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='scroller'",
       "bounds": [450, 600],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "LayoutNGBlockFlow (positioned) DIV id='scroller'",
+      "bounds": [428, 578],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
       "position": [0, 578],
-      "bounds": [428, 22],
+      "bounds": [450, 22],
+      "contentsOpaqueForText": true,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [428, 0],
       "bounds": [22, 578],
       "transform": 1
     },
     {
-      "name": "Scroll Corner Layer",
-      "position": [428, 578],
-      "bounds": [22, 22],
-      "transform": 1
-    },
-    {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow (positioned) DIV id='scroller'",
       "bounds": [428, 1350],
+      "contentsOpaqueForText": true,
       "invalidations": [
         [75, 465, 300, 75],
         [75, 300, 300, 75]

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-scroll-body-appear-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-scroll-body-appear-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-scroll-body-appear-expected.txt
index 551888c..6c222c6 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-scroll-body-appear-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-scroll-body-appear-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [3012, 3138],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -10,21 +10,20 @@
       ]
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 878],
-      "bounds": [1178, 22],
-      "contentsOpaque": true
+      "bounds": [1178, 22]
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 878],
-      "contentsOpaque": true
+      "bounds": [22, 878]
     },
     {
-      "name": "Scroll Corner Layer",
+      "name": "Scroll corner of LayoutView #document",
       "position": [1178, 878],
       "bounds": [22, 22],
+      "contentsOpaque": true,
       "invalidations": [
         [0, 0, 22, 22]
       ]

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-scroll-composited-non-stacking-child-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-scroll-composited-non-stacking-child-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-scroll-composited-non-stacking-child-expected.txt
index 173b488..46864e3 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-scroll-composited-non-stacking-child-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-scroll-composited-non-stacking-child-expected.txt
@@ -1,8 +1,10 @@
 {
   "layers": [
     {
-      "name": "LayoutNGBlockFlow HTML",
-      "bounds": [1200, 402]
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='back'",
@@ -13,33 +15,32 @@
       "transform": 2
     },
     {
-      "name": "LayoutNGBlockFlow HTML (foreground) Layer",
-      "bounds": [1200, 402]
+      "name": "LayoutNGBlockFlow HTML",
+      "position": [12, 90],
+      "bounds": [1176, 300],
+      "contentsOpaqueForText": true
     },
     {
       "name": "LayoutNGBlockFlow DIV class='scroller'",
-      "bounds": [465, 300],
+      "position": [8, 8],
+      "bounds": [428, 263],
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
-      "position": [7, 271],
-      "bounds": [428, 22],
+      "name": "HorizontalScrollbar",
+      "position": [7, 270],
+      "bounds": [450, 23],
+      "contentsOpaqueForText": true,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [436, 7],
       "bounds": [22, 263],
       "transform": 1
     },
     {
-      "name": "Scroll Corner Layer",
-      "position": [435, 270],
-      "bounds": [22, 22],
-      "transform": 1
-    },
-    {
       "name": "LayoutNGBlockFlow (positioned) DIV class='icon'",
       "bounds": [60, 60],
       "contentsOpaque": true,
@@ -50,14 +51,9 @@
       "name": "LayoutNGBlockFlow (relative positioned) DIV class='list'",
       "position": [38, 38],
       "bounds": [270, 375],
+      "contentsOpaqueForText": true,
       "drawsContent": false,
       "transform": 2
-    },
-    {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (relative positioned) DIV class='commit')",
-      "position": [37, 37],
-      "bounds": [271, 376],
-      "transform": 2
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-scroll-delete-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-scroll-delete-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-scroll-delete-expected.txt
index 71fde0c0..e3781ed 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-scroll-delete-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-scroll-delete-expected.txt
@@ -1,27 +1,29 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow DIV id='t'",
-      "bounds": [120, 104],
+      "bounds": [98, 104],
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [98, 0],
       "bounds": [22, 104],
       "transform": 1
     },
     {
-      "name": "Scrolling Contents Layer",
-      "bounds": [98, 297],
+      "name": "LayoutNGBlockFlow DIV id='t'",
+      "position": [0, 243],
+      "bounds": [65, 54],
       "invalidations": [
-        [0, 243, 65, 53]
+        [0, 0, 65, 53]
       ],
       "transform": 2
     }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-scroll-in-overflow-scroll-scrolled-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-scroll-in-overflow-scroll-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-scroll-in-overflow-scroll-scrolled-expected.txt
index 67560bf..561098f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-scroll-in-overflow-scroll-scrolled-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-scroll-in-overflow-scroll-scrolled-expected.txt
@@ -1,41 +1,46 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow DIV id='outerDiv'",
-      "bounds": [1176, 450],
+      "bounds": [1154, 450],
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1154, 0],
       "bounds": [22, 450],
       "transform": 1
     },
     {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow DIV id='outerDiv'",
       "bounds": [1154, 1050],
+      "contentsOpaqueForText": true,
       "transform": 2
     },
     {
       "name": "LayoutNGBlockFlow DIV id='innerDiv'",
-      "bounds": [1154, 600],
+      "bounds": [1132, 600],
+      "drawsContent": false,
       "transform": 3
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1132, 0],
       "bounds": [22, 600],
       "transform": 3
     },
     {
-      "name": "Scrolling Contents Layer",
-      "bounds": [1132, 1200],
+      "name": "LayoutNGBlockFlow DIV id='innerDiv'",
+      "bounds": [450, 1200],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
       "transform": 4
     }
   ],

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-scroll-local-background-text-color-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-scroll-local-background-text-color-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-scroll-local-background-text-color-change-expected.txt
index 01bcb5e..f81cc146 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-scroll-local-background-text-color-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/overflow-scroll-local-background-text-color-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,28 +9,18 @@
     {
       "name": "LayoutNGBlockFlow DIV id='scroller'",
       "bounds": [300, 300],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
-      "position": [0, 278],
-      "bounds": [278, 22],
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "bounds": [278, 278],
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "position": [278, 0],
-      "bounds": [22, 278],
-      "transform": 1
-    },
-    {
-      "name": "Scroll Corner Layer",
-      "position": [278, 278],
-      "bounds": [22, 22],
-      "transform": 1
-    },
-    {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
       "bounds": [278, 825],
       "contentsOpaque": true,
       "backgroundColor": "#0000FF",
@@ -38,6 +28,22 @@
         [0, 0, 278, 825]
       ],
       "transform": 2
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 278],
+      "bounds": [300, 22],
+      "contentsOpaqueForText": true,
+      "invalidations": [
+        [0, 0, 278, 22]
+      ],
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [278, 0],
+      "bounds": [22, 278],
+      "transform": 1
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/repaint-composited-child-in-scrolled-container-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/repaint-composited-child-in-scrolled-container-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/repaint-composited-child-in-scrolled-container-expected.txt
index 2de0f7f..99daf91 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/repaint-composited-child-in-scrolled-container-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/repaint-composited-child-in-scrolled-container-expected.txt
@@ -1,41 +1,44 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='outer'",
-      "bounds": [450, 450],
+      "bounds": [428, 428],
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "LayoutNGBlockFlow (positioned) DIV id='outer'",
+      "bounds": [975, 900],
+      "contentsOpaqueForText": true,
+      "backgroundColor": "#0000FF80",
+      "transform": 2
+    },
+    {
+      "name": "HorizontalScrollbar",
       "position": [0, 428],
       "bounds": [428, 22],
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [428, 0],
       "bounds": [22, 428],
       "transform": 1
     },
     {
-      "name": "Scroll Corner Layer",
+      "name": "Scroll corner of LayoutNGBlockFlow (positioned) DIV id='outer'",
       "position": [428, 428],
       "bounds": [22, 22],
+      "contentsOpaque": true,
       "transform": 1
     },
     {
-      "name": "Scrolling Contents Layer",
-      "bounds": [975, 900],
-      "backgroundColor": "#0000FF80",
-      "transform": 2
-    },
-    {
       "name": "LayoutNGBlockFlow (positioned) DIV id='container'",
       "bounds": [900, 900],
       "contentsOpaque": true,

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/repaint-during-scroll-with-zoom-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/repaint-during-scroll-with-zoom-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/repaint-during-scroll-with-zoom-expected.txt
index f6e6ed7..96da5318 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/repaint-during-scroll-with-zoom-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/repaint-during-scroll-with-zoom-expected.txt
@@ -1,34 +1,35 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#C0C0C0"
     },
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [3012, 3024],
-      "contentsOpaqueForText": true,
+      "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "transform": 2
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 353],
       "bounds": [353, 22],
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [353, 0],
       "bounds": [22, 353],
       "transform": 1
     },
     {
-      "name": "Scroll Corner Layer",
+      "name": "Scroll corner of LayoutView #document",
       "position": [353, 353],
       "bounds": [22, 22],
+      "contentsOpaque": true,
       "transform": 1
     }
   ],

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/resize-scrollable-div-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/resize-scrollable-div-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/resize-scrollable-div-expected.txt
index c5df3e3..14dbebc 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/resize-scrollable-div-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/resize-scrollable-div-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/resize-scrollable-iframe-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/resize-scrollable-iframe-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/resize-scrollable-iframe-expected.txt
index 1753bea..6974a63 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/resize-scrollable-iframe-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/resize-scrollable-iframe-expected.txt
@@ -1,36 +1,39 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "Scrolling Contents Layer",
-      "bounds": [1512, 1524],
-      "transform": 1
-    },
-    {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 428],
       "bounds": [428, 22],
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [428, 0],
       "bounds": [22, 428],
       "transform": 1
     },
     {
-      "name": "Scroll Corner Layer",
+      "name": "Scroll corner of LayoutView #document",
       "position": [428, 428],
       "bounds": [22, 22],
+      "contentsOpaque": true,
       "invalidations": [
         [0, 0, 22, 22]
       ],
       "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow HTML",
+      "bounds": [1512, 1524],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 1
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scroll-descendant-with-cached-cliprects-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scroll-descendant-with-cached-cliprects-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scroll-descendant-with-cached-cliprects-expected.txt
index 09a0561..ea3eb20 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scroll-descendant-with-cached-cliprects-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scroll-descendant-with-cached-cliprects-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 2840],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -13,6 +13,7 @@
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='scrollpanel'",
       "bounds": [150, 150],
+      "contentsOpaque": true,
       "backgroundColor": "#FF0000",
       "invalidations": [
         [0, 0, 150, 150]
@@ -20,10 +21,9 @@
       "transform": 2
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scroll-fixed-layer-with-no-visible-content-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scroll-fixed-layer-with-no-visible-content-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scroll-fixed-layer-with-no-visible-content-expected.txt
index 9be34118..75e5e27 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scroll-fixed-layer-with-no-visible-content-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scroll-fixed-layer-with-no-visible-content-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 3024],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -10,6 +10,7 @@
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='moveMe' class='fixed clipped'",
       "bounds": [150, 150],
+      "contentsOpaque": true,
       "backgroundColor": "#008000",
       "invalidations": [
         [0, 0, 150, 150]
@@ -17,10 +18,9 @@
       "transform": 2
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scroll-fixed-layer-with-transformed-parent-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scroll-fixed-layer-with-transformed-parent-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scroll-fixed-layer-with-transformed-parent-layer-expected.txt
index da968aed..c5932e0 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scroll-fixed-layer-with-transformed-parent-layer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scroll-fixed-layer-with-transformed-parent-layer-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scroll-in-clipped-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scroll-in-clipped-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scroll-in-clipped-layer-expected.txt
index ae4a3ce..a3803d4 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scroll-in-clipped-layer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scroll-in-clipped-layer-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 3024],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -10,10 +10,9 @@
       ]
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scroll-in-fixed-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scroll-in-fixed-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scroll-in-fixed-layer-expected.txt
index 9be34118..75e5e27 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scroll-in-fixed-layer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scroll-in-fixed-layer-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 3024],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -10,6 +10,7 @@
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='moveMe' class='fixed clipped'",
       "bounds": [150, 150],
+      "contentsOpaque": true,
       "backgroundColor": "#008000",
       "invalidations": [
         [0, 0, 150, 150]
@@ -17,10 +18,9 @@
       "transform": 2
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scroll-in-transformed-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scroll-in-transformed-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scroll-in-transformed-layer-expected.txt
index 31b3123..384551b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scroll-in-transformed-layer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scroll-in-transformed-layer-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scroll-stacking-context-backface-visiblity-leaves-traces-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scroll-stacking-context-backface-visiblity-leaves-traces-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scroll-stacking-context-backface-visiblity-leaves-traces-expected.txt
index 2f7361f0..8628f49 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scroll-stacking-context-backface-visiblity-leaves-traces-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scroll-stacking-context-backface-visiblity-leaves-traces-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 7581],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -10,6 +10,7 @@
     {
       "name": "LayoutNGBlockFlow (relative positioned) HEADER",
       "bounds": [1154, 30],
+      "contentsOpaqueForText": true,
       "drawsContent": false,
       "backfaceVisibility": "hidden",
       "transform": 2
@@ -17,14 +18,14 @@
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='searchbar'",
       "bounds": [225, 225],
+      "contentsOpaque": true,
       "backgroundColor": "#800080",
       "transform": 3
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scroll-with-transformed-parent-layer-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scroll-with-transformed-parent-layer-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scroll-with-transformed-parent-layer-expected.png
index 531c064e..3f372f4d 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scroll-with-transformed-parent-layer-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scroll-with-transformed-parent-layer-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scroll-with-transformed-parent-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scroll-with-transformed-parent-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scroll-with-transformed-parent-layer-expected.txt
index 31b3123..384551b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scroll-with-transformed-parent-layer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scroll-with-transformed-parent-layer-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scrollbar-ancestor-clip-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scrollbar-ancestor-clip-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scrollbar-ancestor-clip-change-expected.txt
index 72a22bdf..d3d8ab7f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scrollbar-ancestor-clip-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scrollbar-ancestor-clip-change-expected.txt
@@ -1,37 +1,44 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow DIV id='target'",
-      "bounds": [150, 300],
+      "bounds": [128, 278],
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 278],
       "bounds": [128, 22],
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [128, 0],
       "bounds": [22, 278],
       "transform": 1
     },
     {
-      "name": "Scroll Corner Layer",
+      "name": "Scroll corner of LayoutNGBlockFlow DIV id='target'",
       "position": [128, 278],
       "bounds": [22, 22],
+      "contentsOpaque": true,
+      "invalidations": [
+        [0, 0, 22, 22]
+      ],
       "transform": 1
     },
     {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow DIV id='target'",
       "bounds": [600, 600],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
       "transform": 1
     }
   ],

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scrollbar-invalidation-on-resize-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scrollbar-invalidation-on-resize-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scrollbar-invalidation-on-resize-expected.txt
index fed8e5b..7938bbd 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scrollbar-invalidation-on-resize-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scrollbar-invalidation-on-resize-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scrollbar-invalidation-on-resize-with-border-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scrollbar-invalidation-on-resize-with-border-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scrollbar-invalidation-on-resize-with-border-expected.txt
index 64ae0f8..911c78f6 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scrollbar-invalidation-on-resize-with-border-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scrollbar-invalidation-on-resize-with-border-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scrollbar-parts-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scrollbar-parts-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scrollbar-parts-expected.txt
index d2954ef..10e20f1 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scrollbar-parts-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scrollbar-parts-expected.txt
@@ -1,37 +1,41 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow DIV",
-      "bounds": [150, 150],
+      "bounds": [128, 128],
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 128],
       "bounds": [128, 22],
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [128, 0],
       "bounds": [22, 128],
       "transform": 1
     },
     {
-      "name": "Scroll Corner Layer",
+      "name": "Scroll corner of LayoutNGBlockFlow DIV",
       "position": [128, 128],
       "bounds": [22, 22],
+      "contentsOpaque": true,
       "transform": 1
     },
     {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow DIV",
       "bounds": [225, 450],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
       "transform": 1
     }
   ],

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scrolled-iframe-scrollbar-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scrolled-iframe-scrollbar-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scrolled-iframe-scrollbar-change-expected.txt
index 1532dea..7baba3a 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scrolled-iframe-scrollbar-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/scrolled-iframe-scrollbar-change-expected.txt
@@ -1,19 +1,13 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1206, 906],
       "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF"
-    },
-    {
-      "name": "LayoutView #document",
-      "bounds": [1200, 900],
       "backgroundColor": "#FF0000",
       "invalidations": [
-        [12, 0, 1176, 888]
-      ],
-      "transform": 1
+        [15, 3, 1176, 888]
+      ]
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='overlay'",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/sticky/invalidate-after-composited-scroll-with-sticky-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/sticky/invalidate-after-composited-scroll-with-sticky-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/sticky/invalidate-after-composited-scroll-with-sticky-expected.txt
index 4bdca2fd3..92739f6 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/sticky/invalidate-after-composited-scroll-with-sticky-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/scroll/sticky/invalidate-after-composited-scroll-with-sticky-expected.txt
@@ -1,25 +1,29 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 984],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow MAT id='scroller'",
-      "bounds": [540, 960],
+      "bounds": [518, 960],
+      "drawsContent": false,
       "transform": 2
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [518, 0],
       "bounds": [22, 960],
       "transform": 2
     },
     {
-      "name": "Scrolling Contents Layer",
-      "bounds": [518, 3027],
+      "name": "LayoutNGBlockFlow MAT id='scroller'",
+      "position": [0, 27],
+      "bounds": [518, 3000],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
       "transform": 3
     },
     {
@@ -28,10 +32,9 @@
       "transform": 4
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/search-field-cancel-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/search-field-cancel-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/search-field-cancel-expected.txt
index 99957da..cbb9ba8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/search-field-cancel-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/search-field-cancel-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/invalidation-rect-includes-newline-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/invalidation-rect-includes-newline-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/invalidation-rect-includes-newline-expected.txt
index 345d04e..67b81a5 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/invalidation-rect-includes-newline-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/invalidation-rect-includes-newline-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/invalidation-rect-includes-newline-for-rtl-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/invalidation-rect-includes-newline-for-rtl-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/invalidation-rect-includes-newline-for-rtl-expected.txt
index c706e0a4..8a111a8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/invalidation-rect-includes-newline-for-rtl-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/invalidation-rect-includes-newline-for-rtl-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-lr-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-lr-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-lr-expected.txt
index d674d43..1d61b8b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-lr-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-lr-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-rl-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-rl-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-rl-expected.txt
index d674d43..1d61b8b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-rl-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-rl-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/invalidation-rect-with-br-includes-newline-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/invalidation-rect-with-br-includes-newline-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/invalidation-rect-with-br-includes-newline-expected.txt
index 0bc35be..6a1d5db 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/invalidation-rect-with-br-includes-newline-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/invalidation-rect-with-br-includes-newline-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/japanese-rl-selection-clear-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/japanese-rl-selection-clear-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/japanese-rl-selection-clear-expected.txt
index 0241198..6a1d5c2 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/japanese-rl-selection-clear-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/japanese-rl-selection-clear-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/repaint-rect-for-vertical-writing-mode-with-positioned-root-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/repaint-rect-for-vertical-writing-mode-with-positioned-root-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/repaint-rect-for-vertical-writing-mode-with-positioned-root-expected.txt
index 5ea3268..ba5394c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/repaint-rect-for-vertical-writing-mode-with-positioned-root-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/repaint-rect-for-vertical-writing-mode-with-positioned-root-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selected-replaced-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selected-replaced-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selected-replaced-expected.txt
index a67fcf7..cec67a85 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selected-replaced-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selected-replaced-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-after-delete-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-after-delete-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-after-delete-expected.txt
index db7551fd..fe3a7a3 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-after-delete-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-after-delete-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-after-remove-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-after-remove-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-after-remove-expected.txt
index db7551fd..fe3a7a3 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-after-remove-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-after-remove-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-change-in-iframe-with-relative-parent-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-change-in-iframe-with-relative-parent-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-change-in-iframe-with-relative-parent-expected.txt
index 8e19583..5be0592 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-change-in-iframe-with-relative-parent-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-change-in-iframe-with-relative-parent-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-clear-after-move-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-clear-after-move-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-clear-after-move-expected.txt
index 02cabce8..7c8885f7 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-clear-after-move-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-clear-after-move-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-clear-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-clear-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-clear-expected.txt
index 2e1eb0b9..5c3a944 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-clear-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-clear-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-in-composited-scrolling-container-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-in-composited-scrolling-container-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-in-composited-scrolling-container-expected.png
index eb2c896..b73ca94 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-in-composited-scrolling-container-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-in-composited-scrolling-container-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-in-composited-scrolling-container-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-in-composited-scrolling-container-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-in-composited-scrolling-container-expected.txt
index a2cdcf1d..ad79bb8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-in-composited-scrolling-container-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-in-composited-scrolling-container-expected.txt
@@ -1,12 +1,12 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "invalidations": [
-        [11, 11, 97, 34]
+        [9, 9, 101, 38]
       ]
     }
   ]

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.png
index 6d361e9..f73297ce 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.txt
index a2cdcf1d..ad79bb8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.txt
@@ -1,12 +1,12 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "invalidations": [
-        [11, 11, 97, 34]
+        [9, 9, 101, 38]
       ]
     }
   ]

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-partial-invalidation-between-blocks-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-partial-invalidation-between-blocks-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-partial-invalidation-between-blocks-expected.txt
index 1e734908..253fa63 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-partial-invalidation-between-blocks-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-partial-invalidation-between-blocks-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-rl-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-rl-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-rl-expected.txt
index 8327cac..d251b90 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-rl-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-rl-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-within-composited-scroller-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-within-composited-scroller-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-within-composited-scroller-expected.txt
index 4166e5f..d0e0039d 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-within-composited-scroller-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/selection-within-composited-scroller-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,28 +9,18 @@
     {
       "name": "LayoutNGBlockFlow DIV id='scroller'",
       "bounds": [300, 300],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
-      "position": [0, 278],
-      "bounds": [278, 22],
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "bounds": [278, 278],
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "position": [278, 0],
-      "bounds": [22, 278],
-      "transform": 1
-    },
-    {
-      "name": "Scroll Corner Layer",
-      "position": [278, 278],
-      "bounds": [22, 22],
-      "transform": 1
-    },
-    {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
       "bounds": [300, 2430],
       "contentsOpaque": true,
       "backgroundColor": "#ADD8E6",
@@ -38,6 +28,25 @@
         [0, 915, 34, 27]
       ],
       "transform": 2
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 278],
+      "bounds": [278, 22],
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [278, 0],
+      "bounds": [22, 278],
+      "transform": 1
+    },
+    {
+      "name": "Scroll corner of LayoutNGBlockFlow DIV id='scroller'",
+      "position": [278, 278],
+      "bounds": [22, 22],
+      "contentsOpaque": true,
+      "transform": 1
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/text-selection-rect-in-overflow-2-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/text-selection-rect-in-overflow-2-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/text-selection-rect-in-overflow-2-expected.txt
index a8f9f10e..aba671f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/text-selection-rect-in-overflow-2-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/text-selection-rect-in-overflow-2-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/text-selection-rect-in-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/text-selection-rect-in-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/text-selection-rect-in-overflow-expected.txt
index 1661635..c8ed95f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/text-selection-rect-in-overflow-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/selection/text-selection-rect-in-overflow-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/set-text-content-same-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/set-text-content-same-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/set-text-content-same-expected.txt
index 7f87abd0..36ece76f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/set-text-content-same-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/set-text-content-same-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/stacked-diacritics-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/stacked-diacritics-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/stacked-diacritics-expected.txt
index d92b428..8cec328 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/stacked-diacritics-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/stacked-diacritics-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/stacking-context-lost-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/stacking-context-lost-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/stacking-context-lost-expected.txt
index 34a7a034..59c2f6c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/stacking-context-lost-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/stacking-context-lost-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/subtree-root-skipped-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/subtree-root-skipped-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/subtree-root-skipped-expected.png
index bc963689..2bf354d 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/subtree-root-skipped-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/subtree-root-skipped-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/subtree-root-skipped-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/subtree-root-skipped-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/subtree-root-skipped-expected.txt
index c431391..8f5b919 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/subtree-root-skipped-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/subtree-root-skipped-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/absolute-sized-document-no-scrollbars-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/absolute-sized-document-no-scrollbars-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/absolute-sized-document-no-scrollbars-expected.txt
index f29b2b9d..d5c7d6a 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/absolute-sized-document-no-scrollbars-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/absolute-sized-document-no-scrollbars-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/add-background-property-on-root-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/add-background-property-on-root-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/add-background-property-on-root-expected.txt
index d9f3e56d..72edcfd 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/add-background-property-on-root-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/add-background-property-on-root-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/add-border-property-on-root-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/add-border-property-on-root-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/add-border-property-on-root-expected.txt
index 991b5bd..21553b1 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/add-border-property-on-root-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/add-border-property-on-root-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/add-outline-property-on-root-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/add-outline-property-on-root-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/add-outline-property-on-root-expected.txt
index 5dc7779..e1ca6ee 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/add-outline-property-on-root-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/add-outline-property-on-root-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/animate-fill-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/animate-fill-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/animate-fill-expected.txt
index fd4e3be05..7068f8f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/animate-fill-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/animate-fill-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/animate-target-id-changed-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/animate-target-id-changed-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/animate-target-id-changed-expected.txt
index fd4e3be05..7068f8f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/animate-target-id-changed-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/animate-target-id-changed-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/animate-viewport-overflow-2-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/animate-viewport-overflow-2-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/animate-viewport-overflow-2-expected.txt
index d068ec96..5e9dfd1 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/animate-viewport-overflow-2-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/animate-viewport-overflow-2-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/animate-viewport-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/animate-viewport-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/animate-viewport-overflow-expected.txt
index 24e8c55..c8e79ff7 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/animate-viewport-overflow-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/animate-viewport-overflow-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/animated-path-inside-transformed-html-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/animated-path-inside-transformed-html-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/animated-path-inside-transformed-html-expected.png
index 7dc489cf..0281dc5 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/animated-path-inside-transformed-html-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/animated-path-inside-transformed-html-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/animated-path-inside-transformed-html-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/animated-path-inside-transformed-html-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/animated-path-inside-transformed-html-expected.txt
index 669d528..3f892f21 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/animated-path-inside-transformed-html-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/animated-path-inside-transformed-html-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/animated-svg-as-image-background-offscreen-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/animated-svg-as-image-background-offscreen-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/animated-svg-as-image-background-offscreen-expected.txt
index fa695d2..df75667d 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/animated-svg-as-image-background-offscreen-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/animated-svg-as-image-background-offscreen-expected.txt
@@ -1,28 +1,27 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [3012, 3024],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 878],
-      "bounds": [1178, 22],
-      "contentsOpaque": true
+      "bounds": [1178, 22]
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 878],
-      "contentsOpaque": true
+      "bounds": [22, 878]
     },
     {
-      "name": "Scroll Corner Layer",
+      "name": "Scroll corner of LayoutView #document",
       "position": [1178, 878],
-      "bounds": [22, 22]
+      "bounds": [22, 22],
+      "contentsOpaque": true
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/animated-svg-as-image-offscreen-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/animated-svg-as-image-offscreen-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/animated-svg-as-image-offscreen-expected.txt
index fa695d2..df75667d 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/animated-svg-as-image-offscreen-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/animated-svg-as-image-offscreen-expected.txt
@@ -1,28 +1,27 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [3012, 3024],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 878],
-      "bounds": [1178, 22],
-      "contentsOpaque": true
+      "bounds": [1178, 22]
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 878],
-      "contentsOpaque": true
+      "bounds": [22, 878]
     },
     {
-      "name": "Scroll Corner Layer",
+      "name": "Scroll corner of LayoutView #document",
       "position": [1178, 878],
-      "bounds": [22, 22]
+      "bounds": [22, 22],
+      "contentsOpaque": true
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/animated-svg-as-image-transformed-offscreen-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/animated-svg-as-image-transformed-offscreen-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/animated-svg-as-image-transformed-offscreen-expected.txt
index f4697ded..6a87e45 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/animated-svg-as-image-transformed-offscreen-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/animated-svg-as-image-transformed-offscreen-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [3012, 3024],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -12,21 +12,20 @@
       "transform": 2
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 878],
-      "bounds": [1178, 22],
-      "contentsOpaque": true
+      "bounds": [1178, 22]
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 878],
-      "contentsOpaque": true
+      "bounds": [22, 878]
     },
     {
-      "name": "Scroll Corner Layer",
+      "name": "Scroll corner of LayoutView #document",
       "position": [1178, 878],
-      "bounds": [22, 22]
+      "bounds": [22, 22],
+      "contentsOpaque": true
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/append-text-node-to-tspan-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/append-text-node-to-tspan-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/append-text-node-to-tspan-expected.txt
index 783b79d..7d9a8fe 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/append-text-node-to-tspan-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/append-text-node-to-tspan-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/change-background-color-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/change-background-color-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/change-background-color-expected.txt
index 8b2970679..7822c75 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/change-background-color-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/change-background-color-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/circle-move-invalidation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/circle-move-invalidation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/circle-move-invalidation-expected.txt
index be17073..f9162c82 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/circle-move-invalidation-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/circle-move-invalidation-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/clip-path-child-changes-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/clip-path-child-changes-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/clip-path-child-changes-expected.txt
index 5998e8c..ce8c643 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/clip-path-child-changes-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/clip-path-child-changes-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/clip-path-href-changes-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/clip-path-href-changes-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/clip-path-href-changes-expected.txt
index 5998e8c..ce8c643 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/clip-path-href-changes-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/clip-path-href-changes-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/clip-path-id-changes-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/clip-path-id-changes-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/clip-path-id-changes-expected.txt
index 5998e8c..ce8c643 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/clip-path-id-changes-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/clip-path-id-changes-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/clip-path-units-changes-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/clip-path-units-changes-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/clip-path-units-changes-expected.txt
index 5998e8c..ce8c643 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/clip-path-units-changes-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/clip-path-units-changes-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/color-fill-currentColor-and-css-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/color-fill-currentColor-and-css-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/color-fill-currentColor-and-css-expected.txt
index cdcdea3..363b7ed0 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/color-fill-currentColor-and-css-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/color-fill-currentColor-and-css-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/color-stop-properties-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/color-stop-properties-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/color-stop-properties-expected.txt
index 8550f11..9b1c986 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/color-stop-properties-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/color-stop-properties-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1212, 930],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -33,21 +33,20 @@
       ]
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 878],
-      "bounds": [1178, 22],
-      "contentsOpaque": true
+      "bounds": [1178, 22]
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 878],
-      "contentsOpaque": true
+      "bounds": [22, 878]
     },
     {
-      "name": "Scroll Corner Layer",
+      "name": "Scroll corner of LayoutView #document",
       "position": [1178, 878],
-      "bounds": [22, 22]
+      "bounds": [22, 22],
+      "contentsOpaque": true
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/composited-svg-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/composited-svg-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/composited-svg-expected.txt
index 80e428f9..6c66e22 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/composited-svg-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/composited-svg-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/container-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/container-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/container-repaint-expected.txt
index 674bcc9..84041a0 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/container-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/container-repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/deep-dynamic-updates-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/deep-dynamic-updates-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/deep-dynamic-updates-expected.txt
index 924f361..6cbcad9c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/deep-dynamic-updates-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/deep-dynamic-updates-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/deep-nested-embedded-svg-size-changes-no-layout-triggers-1-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/deep-nested-embedded-svg-size-changes-no-layout-triggers-1-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/deep-nested-embedded-svg-size-changes-no-layout-triggers-1-expected.txt
index 6f697e1..573ea1b1 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/deep-nested-embedded-svg-size-changes-no-layout-triggers-1-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/deep-nested-embedded-svg-size-changes-no-layout-triggers-1-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/deep-nested-embedded-svg-size-changes-no-layout-triggers-2-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/deep-nested-embedded-svg-size-changes-no-layout-triggers-2-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/deep-nested-embedded-svg-size-changes-no-layout-triggers-2-expected.txt
index 6f697e1..573ea1b1 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/deep-nested-embedded-svg-size-changes-no-layout-triggers-2-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/deep-nested-embedded-svg-size-changes-no-layout-triggers-2-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/embedded-svg-size-changes-no-layout-triggers-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/embedded-svg-size-changes-no-layout-triggers-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/embedded-svg-size-changes-no-layout-triggers-expected.txt
index 1608d334..38f7515 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/embedded-svg-size-changes-no-layout-triggers-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/embedded-svg-size-changes-no-layout-triggers-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/ems-display-none-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/ems-display-none-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/ems-display-none-expected.txt
index 32f25fb..545745a5 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/ems-display-none-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/ems-display-none-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/exs-display-none-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/exs-display-none-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/exs-display-none-expected.txt
index 171f592..8981e69 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/exs-display-none-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/exs-display-none-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-change-target-id-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-change-target-id-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-change-target-id-expected.txt
index fd4e3be05..7068f8f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-change-target-id-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-change-target-id-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-multiple-targets-id-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-multiple-targets-id-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-multiple-targets-id-change-expected.txt
index 4d6f6a2c8..8dfbc6c1 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-multiple-targets-id-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-multiple-targets-id-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-reference-invalidation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-reference-invalidation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-reference-invalidation-expected.txt
index 3a9ac05..9323aa8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-reference-invalidation-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-reference-invalidation-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-remove-target-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-remove-target-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-remove-target-expected.txt
index fd4e3be05..7068f8f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-remove-target-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-remove-target-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-add-to-document-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-add-to-document-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-add-to-document-expected.txt
index 3a9ac05..9323aa8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-add-to-document-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-add-to-document-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-attribute-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-attribute-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-attribute-change-expected.txt
index 3a9ac05..9323aa8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-attribute-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-attribute-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection-2-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection-2-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection-2-expected.txt
index 3a9ac05..9323aa8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection-2-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection-2-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection-expected.txt
index 3a9ac05..9323aa8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-changes-id-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-changes-id-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-changes-id-expected.txt
index fd4e3be05..7068f8f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-changes-id-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-changes-id-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-id-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-id-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-id-change-expected.txt
index fd4e3be05..7068f8f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-id-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-id-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-inline-style-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-inline-style-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-inline-style-change-expected.txt
index 3a9ac05..9323aa8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-inline-style-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-inline-style-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-property-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-property-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-property-change-expected.txt
index 3a9ac05..9323aa8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-property-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-property-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-reappend-to-document-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-reappend-to-document-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-reappend-to-document-expected.txt
index 3a9ac05..9323aa8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-reappend-to-document-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-reappend-to-document-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-remove-from-document-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-remove-from-document-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-remove-from-document-expected.txt
index 3a9ac05..9323aa8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-remove-from-document-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-remove-from-document-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-style-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-style-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-style-change-expected.txt
index 3a9ac05..9323aa8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-style-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/feImage-target-style-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/fecomponenttransfer-in1-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/fecomponenttransfer-in1-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/fecomponenttransfer-in1-change-expected.txt
index fd4e3be05..7068f8f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/fecomponenttransfer-in1-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/fecomponenttransfer-in1-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/fill-opacity-update-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/fill-opacity-update-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/fill-opacity-update-expected.txt
index 5998e8c..ce8c643 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/fill-opacity-update-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/fill-opacity-update-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/filter-child-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/filter-child-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/filter-child-repaint-expected.txt
index ea998470..d1bb859 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/filter-child-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/filter-child-repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/filter-reference-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/filter-reference-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/filter-reference-change-expected.txt
index d9f3e56d..72edcfd 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/filter-reference-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/filter-reference-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/filter-refresh-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/filter-refresh-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/filter-refresh-expected.txt
index 5784e7ec..026cb05 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/filter-refresh-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/filter-refresh-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/filter-width-update-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/filter-width-update-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/filter-width-update-expected.txt
index 7ad44cb..562cec4 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/filter-width-update-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/filter-width-update-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/focus-element-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/focus-element-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/focus-element-expected.png
index 3a8498e..1b36b19 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/focus-element-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/focus-element-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/focus-element-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/focus-element-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/focus-element-expected.txt
index 3e0f8f2c..30666bb 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/focus-element-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/focus-element-expected.txt
@@ -1,12 +1,12 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "invalidations": [
-        [84, 84, 81, 81]
+        [81, 81, 87, 87]
       ]
     }
   ]

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/foreign-object-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/foreign-object-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/foreign-object-repaint-expected.txt
index 065837e2..7542f52 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/foreign-object-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/foreign-object-repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/foreignObject-crash-on-hover-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/foreignObject-crash-on-hover-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/foreignObject-crash-on-hover-expected.txt
index 7f87abd0..36ece76f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/foreignObject-crash-on-hover-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/foreignObject-crash-on-hover-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/gradient-add-stops-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/gradient-add-stops-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/gradient-add-stops-expected.txt
index fd4e3be05..7068f8f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/gradient-add-stops-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/gradient-add-stops-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/gradient-stop-style-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/gradient-stop-style-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/gradient-stop-style-change-expected.txt
index fd4e3be05..7068f8f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/gradient-stop-style-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/gradient-stop-style-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/hairline-stroke-squarecap-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/hairline-stroke-squarecap-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/hairline-stroke-squarecap-expected.txt
index a78f0b3d..1fa0933 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/hairline-stroke-squarecap-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/hairline-stroke-squarecap-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/image-href-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/image-href-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/image-href-change-expected.txt
index 5998e8c..ce8c643 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/image-href-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/image-href-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/image-with-clip-path-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/image-with-clip-path-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/image-with-clip-path-expected.txt
index f1393b18..ddad8bb1 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/image-with-clip-path-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/image-with-clip-path-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/inner-svg-change-viewBox-contract-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/inner-svg-change-viewBox-contract-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/inner-svg-change-viewBox-contract-expected.txt
index 5998e8c..ce8c643 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/inner-svg-change-viewBox-contract-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/inner-svg-change-viewBox-contract-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/inner-svg-change-viewBox-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/inner-svg-change-viewBox-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/inner-svg-change-viewBox-expected.txt
index fd4e3be05..7068f8f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/inner-svg-change-viewBox-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/inner-svg-change-viewBox-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.txt
index 5998e8c..ce8c643 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/invalidate-on-child-layout-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/invalidate-on-child-layout-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/invalidate-on-child-layout-expected.txt
index b66251a..a7f38533 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/invalidate-on-child-layout-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/invalidate-on-child-layout-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.txt
index e375c67..07328300 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-late-clipPath-creation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-late-clipPath-creation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-late-clipPath-creation-expected.txt
index e375c67..07328300 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-late-clipPath-creation-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-late-clipPath-creation-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.txt
index 1fd0812..7c291e2 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-late-gradient-creation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-late-gradient-creation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-late-gradient-creation-expected.txt
index a1be04ff..6fcf557 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-late-gradient-creation-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-late-gradient-creation-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-late-marker-and-object-creation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-late-marker-and-object-creation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-late-marker-and-object-creation-expected.txt
index 8f1ab15..46d6c3c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-late-marker-and-object-creation-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-late-marker-and-object-creation-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-late-marker-creation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-late-marker-creation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-late-marker-creation-expected.txt
index 8f1ab15..46d6c3c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-late-marker-creation-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-late-marker-creation-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.txt
index 40c6319..12992d88 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-late-pattern-creation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-late-pattern-creation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-late-pattern-creation-expected.txt
index 144427f..3e5114f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-late-pattern-creation-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-late-pattern-creation-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-repaint-rect-on-path-with-stroke-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-repaint-rect-on-path-with-stroke-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-repaint-rect-on-path-with-stroke-expected.txt
index 6a7237e..624c293 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-repaint-rect-on-path-with-stroke-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-repaint-rect-on-path-with-stroke-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-bounce-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-bounce-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-bounce-expected.txt
index 10c9fa3..d5e1d3b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-bounce-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-bounce-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-container-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-container-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-container-expected.txt
index 300b2d9a..8bfdeab4 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-container-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-container-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-gradient-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-gradient-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-gradient-expected.txt
index 8935eb1..6513cc30 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-gradient-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-gradient-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-image-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-image-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-image-expected.txt
index 300b2d9a..8bfdeab4 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-image-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-image-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-pattern-child-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-pattern-child-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-pattern-child-expected.txt
index 8935eb1..6513cc30 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-pattern-child-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-pattern-child-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-pattern-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-pattern-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-pattern-expected.txt
index 8935eb1..6513cc30 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-pattern-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-pattern-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-polygon-changes-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-polygon-changes-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-polygon-changes-expected.txt
index 01381e4..7d3f5e5 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-polygon-changes-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-polygon-changes-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-polygon-removal-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-polygon-removal-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-polygon-removal-expected.txt
index 0d6ccda8..85ab216 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-polygon-removal-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-polygon-removal-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-stop-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-stop-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-stop-expected.txt
index 8935eb1..6513cc30 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-stop-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-stop-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-stop-linked-gradient-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-stop-linked-gradient-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-stop-linked-gradient-expected.txt
index 0d976028..ddc4459 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-stop-linked-gradient-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-stop-linked-gradient-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-style-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-style-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-style-expected.txt
index 46f599b..802b382 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-style-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-style-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-transform-addition-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-transform-addition-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-transform-addition-expected.txt
index 0d6ccda8..85ab216 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-transform-addition-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-transform-addition-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-transform-changes-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-transform-changes-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-transform-changes-expected.txt
index 0d6ccda8..85ab216 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-transform-changes-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/js-update-transform-changes-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/marker-child-changes-css-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/marker-child-changes-css-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/marker-child-changes-css-expected.txt
index 080974d..e3542b4a 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/marker-child-changes-css-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/marker-child-changes-css-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/marker-child-changes-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/marker-child-changes-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/marker-child-changes-expected.txt
index 080974d..e3542b4a 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/marker-child-changes-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/marker-child-changes-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/marker-strokeWidth-changes-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/marker-strokeWidth-changes-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/marker-strokeWidth-changes-expected.txt
index 080974d..e3542b4a 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/marker-strokeWidth-changes-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/marker-strokeWidth-changes-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/marker-text-decoration-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/marker-text-decoration-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/marker-text-decoration-change-expected.txt
index 484b2b5..856b6bd 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/marker-text-decoration-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/marker-text-decoration-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/marker-viewBox-changes-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/marker-viewBox-changes-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/marker-viewBox-changes-expected.txt
index b25930b..6166b9f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/marker-viewBox-changes-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/marker-viewBox-changes-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/mask-clip-target-transform-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/mask-clip-target-transform-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/mask-clip-target-transform-expected.txt
index 20a72d32..8b274e27 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/mask-clip-target-transform-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/mask-clip-target-transform-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/mask-invalidation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/mask-invalidation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/mask-invalidation-expected.txt
index f29b2b9d..d5c7d6a 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/mask-invalidation-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/mask-invalidation-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/modify-inserted-listitem-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/modify-inserted-listitem-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/modify-inserted-listitem-expected.txt
index 06f01e2..ac31aa3a 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/modify-inserted-listitem-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/modify-inserted-listitem-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/modify-text-node-in-tspan-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/modify-text-node-in-tspan-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/modify-text-node-in-tspan-expected.txt
index 783b79d..7d9a8fe 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/modify-text-node-in-tspan-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/modify-text-node-in-tspan-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/modify-transferred-listitem-different-attr-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/modify-transferred-listitem-different-attr-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/modify-transferred-listitem-different-attr-expected.txt
index 4957c8f5..8926a4f0 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/modify-transferred-listitem-different-attr-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/modify-transferred-listitem-different-attr-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/modify-transferred-listitem-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/modify-transferred-listitem-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/modify-transferred-listitem-expected.txt
index f3582b5..215f5d0 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/modify-transferred-listitem-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/modify-transferred-listitem-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-1-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-1-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-1-expected.txt
index 1608d334..38f7515 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-1-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-1-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-2-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-2-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-2-expected.txt
index 1608d334..38f7515 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-2-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-2-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/object-sizing-no-width-height-change-content-box-size-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/object-sizing-no-width-height-change-content-box-size-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/object-sizing-no-width-height-change-content-box-size-expected.txt
index 49b47b7..ad27897 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/object-sizing-no-width-height-change-content-box-size-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/object-sizing-no-width-height-change-content-box-size-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/outline-offset-shape-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/outline-offset-shape-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/outline-offset-shape-expected.txt
index 78a585c..26aa8dd8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/outline-offset-shape-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/outline-offset-shape-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/outline-offset-text-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/outline-offset-text-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/outline-offset-text-expected.txt
index 6cff288..5556be3 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/outline-offset-text-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/outline-offset-text-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/overflow-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/overflow-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/overflow-repaint-expected.txt
index 9f783e51..36605bc 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/overflow-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/overflow-repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/paintorder-filtered-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/paintorder-filtered-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/paintorder-filtered-expected.txt
index f2b3e342..287b110b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/paintorder-filtered-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/paintorder-filtered-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/path-pathlength-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/path-pathlength-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/path-pathlength-change-expected.txt
index 5039607..74ec95f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/path-pathlength-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/path-pathlength-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/pending-resource-after-removal-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/pending-resource-after-removal-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/pending-resource-after-removal-expected.txt
index 5998e8c..ce8c643 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/pending-resource-after-removal-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/pending-resource-after-removal-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/rect-modify-rx-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/rect-modify-rx-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/rect-modify-rx-expected.txt
index fd4e3be05..7068f8f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/rect-modify-rx-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/rect-modify-rx-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-content-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-content-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-content-expected.txt
index f1a89f70..a1f32e9 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-content-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-content-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-content-with-resources-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-content-with-resources-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-content-with-resources-expected.txt
index f1a89f70..a1f32e9 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-content-with-resources-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-content-with-resources-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-deep-shadow-tree-content-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-deep-shadow-tree-content-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-deep-shadow-tree-content-expected.txt
index f1a89f70..a1f32e9 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-deep-shadow-tree-content-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-deep-shadow-tree-content-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-document-scrollbars-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-document-scrollbars-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-document-scrollbars-expected.txt
index 9214399..3496b0f7 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-document-scrollbars-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-document-scrollbars-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [2036, 1517],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -10,21 +10,20 @@
       ]
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 878],
-      "bounds": [1178, 22],
-      "contentsOpaque": true
+      "bounds": [1178, 22]
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 878],
-      "contentsOpaque": true
+      "bounds": [22, 878]
     },
     {
-      "name": "Scroll Corner Layer",
+      "name": "Scroll corner of LayoutView #document",
       "position": [1178, 878],
       "bounds": [22, 22],
+      "contentsOpaque": true,
       "invalidations": [
         [0, 0, 22, 22]
       ]

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-image-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-image-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-image-expected.txt
index f1a89f70..a1f32e9 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-image-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-image-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-inner-svg-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-inner-svg-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-inner-svg-expected.txt
index 04e7243..23427fb 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-inner-svg-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-inner-svg-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-shadow-tree-content-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-shadow-tree-content-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-shadow-tree-content-expected.txt
index f1a89f70..a1f32e9 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-shadow-tree-content-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-shadow-tree-content-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-shadow-tree-content-with-symbol-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-shadow-tree-content-with-symbol-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-shadow-tree-content-with-symbol-expected.txt
index f1a89f70..a1f32e9 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-shadow-tree-content-with-symbol-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-shadow-tree-content-with-symbol-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-use-on-symbol-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-use-on-symbol-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-use-on-symbol-expected.txt
index 04e7243..23427fb 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-use-on-symbol-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-use-on-symbol-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.txt
index 04e7243..23427fb 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/remove-background-property-on-root-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/remove-background-property-on-root-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/remove-background-property-on-root-expected.txt
index d9f3e56d..72edcfd 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/remove-background-property-on-root-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/remove-background-property-on-root-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/remove-border-property-on-root-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/remove-border-property-on-root-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/remove-border-property-on-root-expected.txt
index 991b5bd..21553b1 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/remove-border-property-on-root-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/remove-border-property-on-root-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/remove-outline-property-on-root-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/remove-outline-property-on-root-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/remove-outline-property-on-root-expected.txt
index 5dc7779..e1ca6ee 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/remove-outline-property-on-root-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/remove-outline-property-on-root-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/remove-text-node-from-tspan-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/remove-text-node-from-tspan-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/remove-text-node-from-tspan-expected.txt
index 783b79d..7d9a8fe 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/remove-text-node-from-tspan-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/remove-text-node-from-tspan-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/remove-tspan-from-text-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/remove-tspan-from-text-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/remove-tspan-from-text-expected.txt
index a0ff7a2..fb059eb 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/remove-tspan-from-text-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/remove-tspan-from-text-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/repaint-in-scrolled-view-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/repaint-in-scrolled-view-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/repaint-in-scrolled-view-expected.txt
index 27fbc88..2982d310 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/repaint-in-scrolled-view-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/repaint-in-scrolled-view-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [3000, 3000],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -11,21 +11,20 @@
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 878],
-      "bounds": [1178, 22],
-      "contentsOpaque": true
+      "bounds": [1178, 22]
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 878],
-      "contentsOpaque": true
+      "bounds": [22, 878]
     },
     {
-      "name": "Scroll Corner Layer",
+      "name": "Scroll corner of LayoutView #document",
       "position": [1178, 878],
-      "bounds": [22, 22]
+      "bounds": [22, 22],
+      "contentsOpaque": true
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/repaint-moving-svg-and-div-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/repaint-moving-svg-and-div-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/repaint-moving-svg-and-div-expected.txt
index 5a4399f..0ab134a 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/repaint-moving-svg-and-div-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/repaint-moving-svg-and-div-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/repaint-non-scaling-stroke-text-decoration-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/repaint-non-scaling-stroke-text-decoration-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/repaint-non-scaling-stroke-text-decoration-expected.txt
index a713572..7e7269f0 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/repaint-non-scaling-stroke-text-decoration-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/repaint-non-scaling-stroke-text-decoration-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/repaint-non-scaling-stroke-text-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/repaint-non-scaling-stroke-text-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/repaint-non-scaling-stroke-text-expected.txt
index a713572..7e7269f0 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/repaint-non-scaling-stroke-text-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/repaint-non-scaling-stroke-text-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/repaint-on-constant-size-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/repaint-on-constant-size-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/repaint-on-constant-size-change-expected.txt
index 8feec5c..2516a93 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/repaint-on-constant-size-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/repaint-on-constant-size-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/repaint-on-image-bounds-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/repaint-on-image-bounds-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/repaint-on-image-bounds-change-expected.txt
index fd4e3be05..7068f8f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/repaint-on-image-bounds-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/repaint-on-image-bounds-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/repaint-paintorder-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/repaint-paintorder-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/repaint-paintorder-expected.txt
index f2b3e342..287b110b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/repaint-paintorder-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/repaint-paintorder-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/repaint-stroke-width-changes-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/repaint-stroke-width-changes-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/repaint-stroke-width-changes-expected.txt
index d78a7b6..301039f1 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/repaint-stroke-width-changes-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/repaint-stroke-width-changes-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/resize-svg-invalidate-children-2-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/resize-svg-invalidate-children-2-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/resize-svg-invalidate-children-2-expected.txt
index 0055933..e3f4124 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/resize-svg-invalidate-children-2-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/resize-svg-invalidate-children-2-expected.txt
@@ -1,19 +1,16 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutSVGRoot svg",
-      "bounds": [900, 600],
-      "invalidations": [
-        [75, 0, 750, 600],
-        [0, 180, 300, 240]
-      ],
-      "transform": 1
+      "bounds": [500, 400],
+      "contentsOpaque": true,
+      "transform": 2
     }
   ],
   "transforms": [
@@ -25,6 +22,17 @@
         [0, 0, 1, 0],
         [12, 12, 0, 1]
       ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1.5, 0, 0, 0],
+        [0, 1.5, 0, 0],
+        [0, 0, 1, 0],
+        [75, 0, 0, 1]
+      ],
+      "origin": [0, 0]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/resize-svg-invalidate-children-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/resize-svg-invalidate-children-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/resize-svg-invalidate-children-expected.txt
index ed9aae8..a82722c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/resize-svg-invalidate-children-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/resize-svg-invalidate-children-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/resize-svg-root-with-child-stroke-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/resize-svg-root-with-child-stroke-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/resize-svg-root-with-child-stroke-expected.txt
index 1ee0267..e5e37e5 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/resize-svg-root-with-child-stroke-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/resize-svg-root-with-child-stroke-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/resource-client-removal-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/resource-client-removal-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/resource-client-removal-expected.txt
index fd4e3be05..7068f8f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/resource-client-removal-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/resource-client-removal-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/resource-invalidate-on-target-update-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/resource-invalidate-on-target-update-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/resource-invalidate-on-target-update-expected.txt
index 603a52a..161022e 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/resource-invalidate-on-target-update-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/resource-invalidate-on-target-update-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/rounded-rect-height-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/rounded-rect-height-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/rounded-rect-height-change-expected.txt
index 1ac3c26..e149564c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/rounded-rect-height-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/rounded-rect-height-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/scale-change-huge-geometry-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/scale-change-huge-geometry-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/scale-change-huge-geometry-expected.txt
index 2f4ae92..fa86312 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/scale-change-huge-geometry-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/scale-change-huge-geometry-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.png
index 5b2abac..17004916 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt
index c717929..e5c7828 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt
@@ -1,35 +1,34 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1539, 1517],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "invalidations": [
         [314, 1482, 259, 27],
         [643, 1482, 221, 27],
-        [577, 1479, 62, 33],
+        [575, 1477, 66, 37],
         [636, 1482, 7, 27],
         [573, 1482, 7, 27]
       ],
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 878],
-      "bounds": [1178, 22],
-      "contentsOpaque": true
+      "bounds": [1178, 22]
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 878],
-      "contentsOpaque": true
+      "bounds": [22, 878]
     },
     {
-      "name": "Scroll Corner Layer",
+      "name": "Scroll corner of LayoutView #document",
       "position": [1178, 878],
-      "bounds": [22, 22]
+      "bounds": [22, 22],
+      "contentsOpaque": true
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/shape-transform-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/shape-transform-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/shape-transform-change-expected.txt
index 022b1e6..f6d414c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/shape-transform-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/shape-transform-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/shape-with-nested-outline-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/shape-with-nested-outline-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/shape-with-nested-outline-expected.txt
index 022b569..e2dd1ae 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/shape-with-nested-outline-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/shape-with-nested-outline-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/stroke-opacity-update-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/stroke-opacity-update-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/stroke-opacity-update-expected.txt
index c694524d..6a40c49d 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/stroke-opacity-update-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/stroke-opacity-update-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/svg-absolute-children-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/svg-absolute-children-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/svg-absolute-children-expected.txt
index fd4e3be05..7068f8f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/svg-absolute-children-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/svg-absolute-children-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/svg-background-partial-redraw-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/svg-background-partial-redraw-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/svg-background-partial-redraw-expected.txt
index 340b42b9..3eaf5008 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/svg-background-partial-redraw-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/svg-background-partial-redraw-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/svg-image-change-content-size-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/svg-image-change-content-size-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/svg-image-change-content-size-expected.txt
index 946d4b0..bafa16ab 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/svg-image-change-content-size-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/svg-image-change-content-size-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/svg-image-par-resize-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/svg-image-par-resize-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/svg-image-par-resize-expected.txt
index 022b1e6..f6d414c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/svg-image-par-resize-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/svg-image-par-resize-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/svg-length-ch-unit-font-size-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/svg-length-ch-unit-font-size-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/svg-length-ch-unit-font-size-change-expected.txt
index 022b1e6..f6d414c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/svg-length-ch-unit-font-size-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/svg-length-ch-unit-font-size-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/svg-length-rem-unit-font-size-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/svg-length-rem-unit-font-size-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/svg-length-rem-unit-font-size-change-expected.txt
index 0a50c57..293dec0b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/svg-length-rem-unit-font-size-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/svg-length-rem-unit-font-size-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/svgsvgelement-repaint-children-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/svgsvgelement-repaint-children-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/svgsvgelement-repaint-children-expected.txt
index d9f3e56d..72edcfd 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/svgsvgelement-repaint-children-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/svgsvgelement-repaint-children-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/tabgroup-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/tabgroup-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/tabgroup-expected.txt
index dbae40d..b2c3dd3d 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/tabgroup-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/tabgroup-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-dom-removal-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-dom-removal-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-dom-removal-expected.txt
index 330abc95..673e910 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-dom-removal-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-dom-removal-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-mask-update-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-mask-update-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-mask-update-expected.txt
index 1c1d86d..848bf7d 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-mask-update-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-mask-update-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-pattern-update-2-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-pattern-update-2-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-pattern-update-2-expected.txt
index 4177c87..14f5d1d 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-pattern-update-2-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-pattern-update-2-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-pattern-update-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-pattern-update-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-pattern-update-expected.txt
index d9f3e56d..72edcfd 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-pattern-update-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-pattern-update-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-repaint-including-stroke-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-repaint-including-stroke-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-repaint-including-stroke-expected.txt
index be57885..e1791a9 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-repaint-including-stroke-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-repaint-including-stroke-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-rescale-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-rescale-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-rescale-expected.txt
index 5202c22..4e5a51d 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-rescale-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-rescale-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-selection-text-05-t-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-selection-text-05-t-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-selection-text-05-t-expected.txt
index f29b2b9d..bb15043 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-selection-text-05-t-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-selection-text-05-t-expected.txt
@@ -1,12 +1,54 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "invalidations": [
-        [0, 0, 1200, 900]
+        [24, 784, 662, 114],
+        [782, 19, 186, 49],
+        [532, 19, 186, 49],
+        [282, 19, 186, 49],
+        [400, 727, 165, 41],
+        [400, 302, 165, 31],
+        [642, 727, 153, 41],
+        [642, 302, 153, 31],
+        [885, 727, 140, 41],
+        [885, 302, 140, 31],
+        [567, 54, 116, 49],
+        [25, 737, 110, 48],
+        [25, 662, 110, 48],
+        [25, 587, 110, 48],
+        [25, 512, 110, 48],
+        [25, 437, 110, 48],
+        [25, 362, 110, 48],
+        [25, 287, 110, 48],
+        [25, 212, 110, 48],
+        [25, 137, 110, 48],
+        [642, 427, 91, 78],
+        [642, 652, 91, 41],
+        [642, 227, 91, 28],
+        [885, 427, 90, 78],
+        [400, 427, 90, 78],
+        [885, 652, 90, 41],
+        [400, 652, 90, 41],
+        [885, 227, 90, 28],
+        [400, 227, 90, 28],
+        [339, 54, 72, 49],
+        [885, 502, 68, 78],
+        [642, 502, 66, 78],
+        [400, 502, 65, 78],
+        [844, 54, 62, 49],
+        [617, 352, 56, 78],
+        [597, 152, 56, 28],
+        [860, 352, 55, 78],
+        [375, 352, 53, 78],
+        [375, 577, 53, 66],
+        [822, 152, 53, 28],
+        [375, 152, 53, 28],
+        [847, 577, 43, 66],
+        [617, 577, 41, 66]
       ]
     }
   ]

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-selection-update-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-selection-update-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-selection-update-expected.txt
index 462ba60..34299566 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-selection-update-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-selection-update-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-viewbox-rescale-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-viewbox-rescale-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-viewbox-rescale-expected.txt
index 5998e8c..ce8c643 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-viewbox-rescale-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-viewbox-rescale-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-xy-updates-SVGList-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-xy-updates-SVGList-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-xy-updates-SVGList-expected.txt
index 693097a..fdee460 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-xy-updates-SVGList-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/text-xy-updates-SVGList-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1212, 930],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -11,21 +11,20 @@
       ]
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 878],
-      "bounds": [1178, 22],
-      "contentsOpaque": true
+      "bounds": [1178, 22]
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 878],
-      "contentsOpaque": true
+      "bounds": [22, 878]
     },
     {
-      "name": "Scroll Corner Layer",
+      "name": "Scroll corner of LayoutView #document",
       "position": [1178, 878],
-      "bounds": [22, 22]
+      "bounds": [22, 22],
+      "contentsOpaque": true
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/transform-changed-state-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/transform-changed-state-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/transform-changed-state-expected.txt
index 01617c6..d7ac3cd4 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/transform-changed-state-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/transform-changed-state-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/transform-focus-ring-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/transform-focus-ring-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/transform-focus-ring-repaint-expected.txt
index 033f199dd..c1f34a7 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/transform-focus-ring-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/transform-focus-ring-repaint-expected.txt
@@ -1,28 +1,30 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='target'",
-      "position": [-2, -2],
-      "bounds": [304, 304],
+      "position": [-4, -4],
+      "bounds": [308, 308],
+      "contentsOpaqueForText": true,
       "backfaceVisibility": "hidden",
       "backgroundColor": "#FFFF00",
       "invalidations": [
-        [0, 0, 304, 304]
+        [0, 0, 308, 308]
       ],
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV)",
-      "position": [150, 150],
-      "bounds": [450, 660],
+      "name": "LayoutNGBlockFlow (positioned) DIV",
+      "bounds": [660, 450],
+      "contentsOpaqueForText": true,
+      "backfaceVisibility": "hidden",
       "backgroundColor": "#0000FF",
-      "transform": 1
+      "transform": 3
     }
   ],
   "transforms": [
@@ -34,6 +36,27 @@
         [0, 0, 1, 0],
         [12, 87, 0, 1]
       ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [150, 150, 0, 1]
+      ]
+    },
+    {
+      "id": 3,
+      "parent": 2,
+      "transform": [
+        [0, 1, 0, 0],
+        [-1, 0, 0, 0],
+        [0, 0, 1, 0],
+        [0, 0, 0, 1]
+      ],
+      "origin": [225, 225]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/transform-foreign-object-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/transform-foreign-object-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/transform-foreign-object-expected.txt
index 92e63c9..4cae0a6 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/transform-foreign-object-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/transform-foreign-object-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/transform-text-element-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/transform-text-element-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/transform-text-element-expected.txt
index 3c091c7f..94085171a 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/transform-text-element-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/transform-text-element-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/tspan-dynamic-positioning-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/tspan-dynamic-positioning-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/tspan-dynamic-positioning-expected.txt
index 3158580..5121970 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/tspan-dynamic-positioning-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/tspan-dynamic-positioning-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/tspan-pattern-update-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/tspan-pattern-update-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/tspan-pattern-update-expected.txt
index e273c19..6235159 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/tspan-pattern-update-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/tspan-pattern-update-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/use-clipped-hit-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/use-clipped-hit-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/use-clipped-hit-expected.txt
index 13c94e1..5f7eb9c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/use-clipped-hit-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/use-clipped-hit-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/use-detach-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/use-detach-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/use-detach-expected.txt
index 781fa76..7db8e76 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/use-detach-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/use-detach-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/use-disappears-after-style-update-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/use-disappears-after-style-update-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/use-disappears-after-style-update-expected.txt
index 87bc178..66067072 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/use-disappears-after-style-update-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/use-disappears-after-style-update-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/use-inherit-style-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/use-inherit-style-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/use-inherit-style-expected.txt
index 416d1d7..60b00b8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/use-inherit-style-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/use-inherit-style-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/use-setAttribute-crash-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/use-setAttribute-crash-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/use-setAttribute-crash-expected.txt
index d43525a8..9a751a79 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/use-setAttribute-crash-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/use-setAttribute-crash-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/window-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/window-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/window-expected.txt
index e9951380..a9d77bc 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/window-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/svg/window-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/add-table-overpaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/add-table-overpaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/add-table-overpaint-expected.txt
index adfe4df..c015f226 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/add-table-overpaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/add-table-overpaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/animated-row-background-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/animated-row-background-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/animated-row-background-expected.txt
index 2c58a5bc..77379f5 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/animated-row-background-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/animated-row-background-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/border-collapse-change-collapse-to-separate-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/border-collapse-change-collapse-to-separate-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/border-collapse-change-collapse-to-separate-expected.txt
index 7eb548a8..4bd8d78 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/border-collapse-change-collapse-to-separate-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/border-collapse-change-collapse-to-separate-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/border-collapse-change-separate-to-collapse-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/border-collapse-change-separate-to-collapse-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/border-collapse-change-separate-to-collapse-expected.txt
index 7eb548a8..4bd8d78 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/border-collapse-change-separate-to-collapse-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/border-collapse-change-separate-to-collapse-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-69296-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-69296-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-69296-expected.txt
index 4caf5d62a..89df420 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-69296-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-69296-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-cell-append-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-cell-append-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-cell-append-expected.txt
index ac00a3f8..73090ce 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-cell-append-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-cell-append-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-cell-remove-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-cell-remove-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-cell-remove-expected.txt
index 1b4a167..cabec17f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-cell-remove-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-cell-remove-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-cell-border-color-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-cell-border-color-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-cell-border-color-expected.txt
index afe8863..0ffb620 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-cell-border-color-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-cell-border-color-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-cell-border-width-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-cell-border-width-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-cell-border-width-expected.txt
index afe8863..0ffb620 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-cell-border-width-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-cell-border-width-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-cell-sl-border-color-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-cell-sl-border-color-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-cell-sl-border-color-expected.txt
index afe8863..0ffb620 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-cell-sl-border-color-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-cell-sl-border-color-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-col-border-color-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-col-border-color-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-col-border-color-expected.txt
index bc86e4d3..e531ca4 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-col-border-color-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-col-border-color-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-col-border-width-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-col-border-width-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-col-border-width-expected.txt
index bc86e4d3..e531ca4 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-col-border-width-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-col-border-width-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-colgroup-border-color-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-colgroup-border-color-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-colgroup-border-color-expected.txt
index c89df6c..8c06426f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-colgroup-border-color-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-colgroup-border-color-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-colgroup-border-width-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-colgroup-border-width-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-colgroup-border-width-expected.txt
index c89df6c..8c06426f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-colgroup-border-width-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-colgroup-border-width-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-row-border-color-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-row-border-color-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-row-border-color-expected.txt
index dcc487812..72c2411 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-row-border-color-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-row-border-color-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-row-border-width-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-row-border-width-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-row-border-width-expected.txt
index dcc487812..72c2411 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-row-border-width-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-row-border-width-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-table-border-color-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-table-border-color-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-table-border-color-expected.txt
index cb4e6e00..f0ce51a 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-table-border-color-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-table-border-color-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-table-border-width-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-table-border-width-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-table-border-width-expected.txt
index cb4e6e00..f0ce51a 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-table-border-width-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-table-border-width-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-tbody-border-color-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-tbody-border-color-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-tbody-border-color-expected.txt
index 758e8fb5..89b755b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-tbody-border-color-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-tbody-border-color-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-tbody-border-width-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-tbody-border-width-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-tbody-border-width-expected.txt
index 758e8fb5..89b755b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-tbody-border-width-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/cached-change-tbody-border-width-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/caret-contenteditable-content-after-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/caret-contenteditable-content-after-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/caret-contenteditable-content-after-expected.png
index 64f2360a..41b4490 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/caret-contenteditable-content-after-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/caret-contenteditable-content-after-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/caret-contenteditable-content-after-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/caret-contenteditable-content-after-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/caret-contenteditable-content-after-expected.txt
index 67b17eb..d1c2faf2 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/caret-contenteditable-content-after-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/caret-contenteditable-content-after-expected.txt
@@ -1,12 +1,12 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "invalidations": [
-        [10, 64, 1180, 31]
+        [8, 62, 1184, 35]
       ]
     }
   ]

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/collapsed-border-cell-resize-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/collapsed-border-cell-resize-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/collapsed-border-cell-resize-expected.txt
index aa11bdf..a00a8e2 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/collapsed-border-cell-resize-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/collapsed-border-cell-resize-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/collapsed-border-change-rowspan-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/collapsed-border-change-rowspan-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/collapsed-border-change-rowspan-expected.txt
index 6150933..fa4f610 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/collapsed-border-change-rowspan-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/collapsed-border-change-rowspan-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-col-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-col-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-col-expected.txt
index 28139a4..d9ff482 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-col-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-col-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-col-initial-empty-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-col-initial-empty-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-col-initial-empty-expected.txt
index 28139a4..d9ff482 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-col-initial-empty-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-col-initial-empty-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-col-span-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-col-span-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-col-span-expected.txt
index 119bb8f..7da3b35 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-col-span-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-col-span-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-col-span-initial-empty-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-col-span-initial-empty-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-col-span-initial-empty-expected.txt
index 119bb8f..7da3b35 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-col-span-initial-empty-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-col-span-initial-empty-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-colgroup-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-colgroup-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-colgroup-expected.txt
index 9abb9b1..ed69b1f4 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-colgroup-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-colgroup-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-colgroup-initial-empty-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-colgroup-initial-empty-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-colgroup-initial-empty-expected.txt
index 9abb9b1..ed69b1f4 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-colgroup-initial-empty-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-colgroup-initial-empty-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-composited-row-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-composited-row-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-composited-row-expected.txt
index cebc541a..0c7dfd0 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-composited-row-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-composited-row-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-composited-row-initial-empty-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-composited-row-initial-empty-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-composited-row-initial-empty-expected.txt
index cebc541a..0c7dfd0 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-composited-row-initial-empty-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-composited-row-initial-empty-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-expected.txt
index e118eac..d7c3c33 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-initial-empty-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-initial-empty-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-initial-empty-expected.txt
index e118eac..d7c3c33 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-initial-empty-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-initial-empty-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-section-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-section-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-section-expected.txt
index 6c661ee6..f8288b9 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-section-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-section-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-section-initial-empty-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-section-initial-empty-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-section-initial-empty-expected.txt
index 6c661ee6..f8288b9 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-section-initial-empty-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-background-section-initial-empty-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-row-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-row-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-row-expected.txt
index 7942a1db..6b2888f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-row-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/composited-table-row-expected.txt
@@ -1,17 +1,17 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGTableRow TR",
-      "bounds": [113, 31],
-      "backgroundColor": "#008000",
+      "position": [-1, -1],
+      "bounds": [115, 33],
       "invalidations": [
-        [0, 0, 57, 31]
+        [0, 0, 58, 33]
       ],
       "transform": 1
     }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/dynamic-table-vertical-alignment-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/dynamic-table-vertical-alignment-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/dynamic-table-vertical-alignment-change-expected.txt
index fb87a92..057bd0dd 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/dynamic-table-vertical-alignment-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/dynamic-table-vertical-alignment-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1212, 878],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -10,10 +10,9 @@
       ]
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 878],
-      "bounds": [1200, 22],
-      "contentsOpaque": true
+      "bounds": [1200, 22]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/fixed-table-cell-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/fixed-table-cell-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/fixed-table-cell-expected.txt
index caf41a0..943676f1 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/fixed-table-cell-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/fixed-table-cell-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 3024],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -21,10 +21,9 @@
       "transform": 2
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/fixed-table-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/fixed-table-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/fixed-table-overflow-expected.txt
index c3bc38b..5a38b6a 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/fixed-table-overflow-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/fixed-table-overflow-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 3024],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -15,6 +15,7 @@
       "name": "LayoutNGBlockFlow (positioned) TD id='moveMe' class='fixed'",
       "position": [-150, 0],
       "bounds": [300, 150],
+      "contentsOpaque": true,
       "backgroundColor": "#008000",
       "invalidations": [
         [0, 0, 300, 150]
@@ -22,10 +23,9 @@
       "transform": 2
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/fixed-table-overflow-zindex-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/fixed-table-overflow-zindex-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/fixed-table-overflow-zindex-expected.txt
index 699a097..ad290a1 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/fixed-table-overflow-zindex-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/fixed-table-overflow-zindex-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 3024],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -21,10 +21,9 @@
       "transform": 2
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/input-overflow-in-table-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/input-overflow-in-table-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/input-overflow-in-table-expected.txt
index 9c309326..4c4e1d14 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/input-overflow-in-table-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/input-overflow-in-table-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/invalidate-cell-in-row-with-offset-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/invalidate-cell-in-row-with-offset-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/invalidate-cell-in-row-with-offset-expected.txt
index ccf4a51..4f6cc1f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/invalidate-cell-in-row-with-offset-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/invalidate-cell-in-row-with-offset-expected.txt
@@ -1,28 +1,26 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGTableRow TR",
-      "drawsContent": false,
+      "bounds": [153, 153],
+      "contentsOpaque": true,
+      "backgroundColor": "#FF0000",
       "transform": 1
     },
     {
-      "name": "LayoutNGTableRow TR",
-      "bounds": [321, 153],
-      "transform": 2
-    },
-    {
       "name": "LayoutNGTableRow TR class='shadow-inset'",
       "bounds": [321, 153],
+      "contentsOpaqueForText": true,
       "invalidations": [
         [0, 0, 153, 153]
       ],
-      "transform": 3
+      "transform": 2
     }
   ],
   "transforms": [
@@ -32,20 +30,11 @@
         [1, 0, 0, 0],
         [0, 1, 0, 0],
         [0, 0, 1, 0],
-        [27, 27, 0, 1]
-      ]
-    },
-    {
-      "id": 2,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
         [27, 42, 0, 1]
       ]
     },
     {
-      "id": 3,
+      "id": 2,
       "transform": [
         [1, 0, 0, 0],
         [0, 1, 0, 0],

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/invisible-col-visible-td-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/invisible-col-visible-td-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/invisible-col-visible-td-expected.txt
index 022b1e6..f6d414c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/invisible-col-visible-td-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/invisible-col-visible-td-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/invisible-tbody-visible-td-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/invisible-tbody-visible-td-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/invisible-tbody-visible-td-expected.txt
index 84311e1..59984b6 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/invisible-tbody-visible-td-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/invisible-tbody-visible-td-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/invisible-tr-visible-td-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/invisible-tr-visible-td-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/invisible-tr-visible-td-expected.txt
index 84311e1..59984b6 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/invisible-tr-visible-td-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/invisible-tr-visible-td-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/no-caret-repaint-in-non-content-editable-element-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/no-caret-repaint-in-non-content-editable-element-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/no-caret-repaint-in-non-content-editable-element-expected.txt
index 7f87abd0..36ece76f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/no-caret-repaint-in-non-content-editable-element-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/no-caret-repaint-in-non-content-editable-element-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/repaint-table-row-in-composited-document-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/repaint-table-row-in-composited-document-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/repaint-table-row-in-composited-document-expected.txt
index e5449ff..c09dc6c9 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/repaint-table-row-in-composited-document-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/repaint-table-row-in-composited-document-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/replace-col-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/replace-col-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/replace-col-expected.txt
index 0284bce..5a383161 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/replace-col-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/replace-col-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/resize-table-repaint-percent-size-cell-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/resize-table-repaint-percent-size-cell-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/resize-table-repaint-percent-size-cell-expected.txt
index d6b8449..1639bb8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/resize-table-repaint-percent-size-cell-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/resize-table-repaint-percent-size-cell-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/resize-table-repaint-vertical-align-cell-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/resize-table-repaint-vertical-align-cell-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/resize-table-repaint-vertical-align-cell-expected.txt
index f32d2dd6..7ab9817 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/resize-table-repaint-vertical-align-cell-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/resize-table-repaint-vertical-align-cell-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/resize-table-row-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/resize-table-row-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/resize-table-row-repaint-expected.txt
index d8b92aa..fd6151ac 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/resize-table-row-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/resize-table-row-repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/row-change-background-rowspan-cell-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/row-change-background-rowspan-cell-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/row-change-background-rowspan-cell-expected.txt
index 2e68992..908604da2 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/row-change-background-rowspan-cell-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/row-change-background-rowspan-cell-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/scroll-inside-table-cell-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/scroll-inside-table-cell-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/scroll-inside-table-cell-expected.txt
index 62e5be3..9b2a20c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/scroll-inside-table-cell-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/scroll-inside-table-cell-expected.txt
@@ -1,38 +1,45 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FF0000"
     },
     {
       "name": "LayoutNGTableCell (relative positioned) TD id='cellToScroll' class='relative'",
-      "bounds": [681, 704],
+      "position": [3, 3],
+      "bounds": [653, 676],
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [3, 679],
       "bounds": [653, 22],
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [656, 3],
-      "bounds": [22, 676],
+      "bounds": [22, 698],
+      "contentsOpaqueForText": true,
       "transform": 1
     },
     {
-      "name": "Scroll Corner Layer",
-      "position": [656, 679],
-      "bounds": [22, 22],
-      "transform": 1
-    },
-    {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='relative red'",
       "position": [3, 3],
-      "bounds": [1425, 676],
+      "bounds": [675, 675],
+      "contentsOpaque": true,
+      "backgroundColor": "#FF0000",
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='absolute green'",
+      "position": [753, 3],
+      "bounds": [675, 675],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
       "transform": 2
     }
   ],

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.txt
index 16b795a..32a53f7 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1588, 878],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -13,10 +13,9 @@
       ]
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 878],
-      "bounds": [1200, 22],
-      "contentsOpaque": true
+      "bounds": [1200, 22]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-cell-collapsed-border-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-cell-collapsed-border-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-cell-collapsed-border-expected.txt
index be756a4f3..1771d2a 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-cell-collapsed-border-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-cell-collapsed-border-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-cell-move-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-cell-move-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-cell-move-expected.txt
index fab51ca3..ae6d50dd 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-cell-move-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-cell-move-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-cell-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-cell-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-cell-overflow-expected.txt
index 3c0c3a1..b1c0242 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-cell-overflow-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-cell-overflow-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-col-background-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-col-background-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-col-background-expected.txt
index da31353..74f9dcf7 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-col-background-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-col-background-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-col-background-offset-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-col-background-offset-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-col-background-offset-expected.txt
index d2dd2f4c..c85bfc1 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-col-background-offset-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-col-background-offset-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-collapsed-border-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-collapsed-border-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-collapsed-border-expected.txt
index 4f680c1..8c6ee59 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-collapsed-border-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-collapsed-border-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-extra-bottom-grow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-extra-bottom-grow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-extra-bottom-grow-expected.txt
index 6738aea0..f5b8135 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-extra-bottom-grow-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-extra-bottom-grow-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-outer-border-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-outer-border-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-outer-border-expected.txt
index 6a19c6c..ccdcba9 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-outer-border-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-outer-border-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-overflow-auto-in-overflow-auto-scrolled-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-overflow-auto-in-overflow-auto-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-overflow-auto-in-overflow-auto-scrolled-expected.txt
index d1a7eba..c88e0d9 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-overflow-auto-in-overflow-auto-scrolled-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-overflow-auto-in-overflow-auto-scrolled-expected.txt
@@ -1,41 +1,45 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow DIV id='outerDiv'",
-      "bounds": [1176, 450],
+      "bounds": [1154, 450],
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1154, 0],
       "bounds": [22, 450],
       "transform": 1
     },
     {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow DIV id='outerDiv'",
       "bounds": [1154, 1050],
+      "contentsOpaqueForText": true,
       "transform": 2
     },
     {
       "name": "LayoutNGBlockFlow DIV id='innerDiv'",
-      "bounds": [1154, 600],
+      "bounds": [1132, 600],
+      "drawsContent": false,
       "transform": 3
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1132, 0],
       "bounds": [22, 600],
       "transform": 3
     },
     {
-      "name": "Scrolling Contents Layer",
-      "bounds": [1132, 1215],
+      "name": "LayoutNGBlockFlow DIV id='innerDiv'",
+      "bounds": [459, 1215],
+      "contentsOpaqueForText": true,
       "transform": 4
     }
   ],

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-overflow-scroll-in-overflow-scroll-scrolled-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-overflow-scroll-in-overflow-scroll-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-overflow-scroll-in-overflow-scroll-scrolled-expected.txt
index d1a7eba..c88e0d9 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-overflow-scroll-in-overflow-scroll-scrolled-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-overflow-scroll-in-overflow-scroll-scrolled-expected.txt
@@ -1,41 +1,45 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow DIV id='outerDiv'",
-      "bounds": [1176, 450],
+      "bounds": [1154, 450],
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1154, 0],
       "bounds": [22, 450],
       "transform": 1
     },
     {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow DIV id='outerDiv'",
       "bounds": [1154, 1050],
+      "contentsOpaqueForText": true,
       "transform": 2
     },
     {
       "name": "LayoutNGBlockFlow DIV id='innerDiv'",
-      "bounds": [1154, 600],
+      "bounds": [1132, 600],
+      "drawsContent": false,
       "transform": 3
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1132, 0],
       "bounds": [22, 600],
       "transform": 3
     },
     {
-      "name": "Scrolling Contents Layer",
-      "bounds": [1132, 1215],
+      "name": "LayoutNGBlockFlow DIV id='innerDiv'",
+      "bounds": [459, 1215],
+      "contentsOpaqueForText": true,
       "transform": 4
     }
   ],

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-row-bg-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-row-bg-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-row-bg-change-expected.txt
index 4d7ed73..33bb000a 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-row-bg-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-row-bg-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-row-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-row-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-row-expected.txt
index 612a97c..544d3907 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-row-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-row-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-section-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-section-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-section-overflow-expected.txt
index 24880862..8c37023 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-section-overflow-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-section-overflow-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-section-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-section-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-section-repaint-expected.txt
index d930a91..f97ef87 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-section-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-section-repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-section-visual-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-section-visual-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-section-visual-overflow-expected.txt
index f5c8795d..834e80e 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-section-visual-overflow-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-section-visual-overflow-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-shrink-row-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-shrink-row-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-shrink-row-repaint-expected.txt
index 13058dd..c7257ff 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-shrink-row-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-shrink-row-repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 1272],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -28,10 +28,9 @@
       ]
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-two-pass-layout-overpaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-two-pass-layout-overpaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-two-pass-layout-overpaint-expected.txt
index aa1d13979..53e43cb 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-two-pass-layout-overpaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-two-pass-layout-overpaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-with-padding-row-invalidation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-with-padding-row-invalidation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-with-padding-row-invalidation-expected.txt
index 8fa772d..be0a70b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-with-padding-row-invalidation-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/table/table-with-padding-row-invalidation-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/text-append-dirty-lines-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/text-append-dirty-lines-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/text-append-dirty-lines-expected.txt
index a62bd2fd..e783bb19 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/text-append-dirty-lines-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/text-append-dirty-lines-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/text-line-clamp-truncation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/text-line-clamp-truncation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/text-line-clamp-truncation-expected.txt
index 0a67a5b..86894402 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/text-line-clamp-truncation-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/text-line-clamp-truncation-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/text-match-document-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/text-match-document-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/text-match-document-change-expected.txt
index 35c8e5df..d596471 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/text-match-document-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/text-match-document-change-expected.txt
@@ -1,24 +1,24 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
-      "name": "Scrolling Contents Layer",
+      "name": "VerticalScrollbar",
+      "position": [428, 0],
+      "bounds": [22, 600],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow HTML",
       "bounds": [428, 1578],
       "invalidations": [
         [12, 39, 389, 54]
       ],
       "transform": 1
-    },
-    {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "position": [428, 0],
-      "bounds": [22, 600],
-      "transform": 1
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/caret-with-transformation-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/caret-with-transformation-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/caret-with-transformation-expected.png
index 82fa21d7..a742bce 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/caret-with-transformation-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/caret-with-transformation-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/caret-with-transformation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/caret-with-transformation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/caret-with-transformation-expected.txt
index a518bb7..b4f4d52 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/caret-with-transformation-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/caret-with-transformation-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/invalidation-with-scale-transform-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/invalidation-with-scale-transform-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/invalidation-with-scale-transform-expected.txt
index 38c0d9f3..2568317 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/invalidation-with-scale-transform-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/invalidation-with-scale-transform-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/resize-skewed-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/resize-skewed-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/resize-skewed-expected.txt
index 1e2430d..4654344f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/resize-skewed-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/resize-skewed-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/subtree-layoutstate-transform-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/subtree-layoutstate-transform-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/subtree-layoutstate-transform-expected.txt
index 952fcb3..27088cb 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/subtree-layoutstate-transform-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/subtree-layoutstate-transform-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/transform-disable-layoutstate-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/transform-disable-layoutstate-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/transform-disable-layoutstate-expected.txt
index d390335..944ae158 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/transform-disable-layoutstate-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/transform-disable-layoutstate-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/transform-inline-layered-child-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/transform-inline-layered-child-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/transform-inline-layered-child-expected.txt
index 1465f578..ffac08c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/transform-inline-layered-child-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/transform-inline-layered-child-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/transform-layout-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/transform-layout-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/transform-layout-repaint-expected.txt
index 73bc2dc..736377fc 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/transform-layout-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/transform-layout-repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/transform-repaint-descendants-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/transform-repaint-descendants-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/transform-repaint-descendants-expected.txt
index a708cfb..1c18f15 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/transform-repaint-descendants-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/transform-repaint-descendants-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/transform-replaced-shadows-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/transform-replaced-shadows-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/transform-replaced-shadows-expected.txt
index 2b61f4e..03c41b9 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/transform-replaced-shadows-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/transform-replaced-shadows-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/transform-rotate-and-remove-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/transform-rotate-and-remove-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/transform-rotate-and-remove-expected.txt
index 7f32918..79fda445 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/transform-rotate-and-remove-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/transform-rotate-and-remove-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/transform-translate-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/transform-translate-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/transform-translate-expected.txt
index becb4c5..a3d7b0f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/transform-translate-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/transform/transform-translate-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/vertical-align-length1-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/vertical-align-length1-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/vertical-align-length1-expected.txt
index ddd6bc4..ba2b59a 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/vertical-align-length1-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/vertical-align-length1-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/vertical-align-length2-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/vertical-align-length2-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/vertical-align-length2-expected.txt
index ca95ef00..f761aa3 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/vertical-align-length2-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/vertical-align-length2-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/vertical-align1-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/vertical-align1-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/vertical-align1-expected.txt
index 3934535a..09eb1ca 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/vertical-align1-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/vertical-align1-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/vertical-align2-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/vertical-align2-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/vertical-align2-expected.txt
index a3c7839..875e630 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/vertical-align2-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/vertical-align2-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/vertical-rl-as-paint-container-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/vertical-rl-as-paint-container-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/vertical-rl-as-paint-container-expected.txt
index 97d59ee9..42c97e1 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/vertical-rl-as-paint-container-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/vertical-rl-as-paint-container-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/video-paint-invalidation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/video-paint-invalidation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/video-paint-invalidation-expected.txt
index 819d8ff..1af2ff86 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/video-paint-invalidation-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/video-paint-invalidation-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,12 +9,6 @@
     {
       "name": "LayoutVideo VIDEO id='video'",
       "bounds": [480, 360],
-      "drawsContent": false,
-      "transform": 1
-    },
-    {
-      "name": "ContentsLayer for LayoutVideo VIDEO id='video'",
-      "bounds": [480, 360],
       "transform": 1
     },
     {

third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/window-resize/window-resize-media-query-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/window-resize/window-resize-media-query-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/window-resize/window-resize-media-query-expected.txt
index 7b9a9e24..ab7f583 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/window-resize/window-resize-media-query-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/invalidation/window-resize/window-resize-media-query-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [600, 250],
       "contentsOpaque": true,
       "backgroundColor": "#FFFF00",
@@ -14,7 +14,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [400, 250],
       "contentsOpaque": true,
       "backgroundColor": "#FFFF00"
@@ -24,7 +24,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [400, 600],
       "contentsOpaque": true,
       "backgroundColor": "#0000FF",
@@ -37,7 +37,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [800, 600],
       "contentsOpaque": true,
       "backgroundColor": "#0000FF",

third_party/blink/web_tests/flag-specific/highdpi/paint/markers/document-markers-font-8px-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/markers/document-markers-font-8px-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/paint/markers/document-markers-font-8px-expected.png
index 449f7d1..a780351f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/markers/document-markers-font-8px-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/markers/document-markers-font-8px-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/paint/markers/document-markers-zoom-2000-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/markers/document-markers-zoom-2000-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/paint/markers/document-markers-zoom-2000-expected.png
index be46c61..8d1c08e 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/markers/document-markers-zoom-2000-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/markers/document-markers-zoom-2000-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/paint/pagination/pagination-change-clip-crash-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/pagination/pagination-change-clip-crash-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/paint/pagination/pagination-change-clip-crash-expected.txt
index 084158d1..e5e6ac14 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/pagination/pagination-change-clip-crash-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/pagination/pagination-change-clip-crash-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 1101],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -13,13 +13,13 @@
       "name": "LayoutNGBlockFlow DIV id='background'",
       "position": [12, 639],
       "bounds": [1154, 450],
+      "contentsOpaqueForText": true,
       "drawsContent": false
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/paint/roundedrects/circle-with-shadow-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/paint/roundedrects/circle-with-shadow-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/paint/roundedrects/circle-with-shadow-expected.png
index 4c2de45..21a5a48 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/paint/roundedrects/circle-with-shadow-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/paint/roundedrects/circle-with-shadow-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/printing/multi-page-background-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/printing/multi-page-background-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/printing/multi-page-background-expected.png
new file mode 100644
index 0000000..1da99ce
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/printing/multi-page-background-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/svg/hittest/text-small-font-size-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/svg/hittest/text-small-font-size-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/svg/hittest/text-small-font-size-expected.txt
index 56f4526..fca0c0f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/svg/hittest/text-small-font-size-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/svg/hittest/text-small-font-size-expected.txt
@@ -1,4 +1,4 @@
 This is a testharness.js-based test.
-FAIL Hit-test of <text> does not hit-test the "background" (w/ small font size) assert_equals: 71,28 expected Element node <text x="9.4" y="17.80">SELECT</text> but got Element node <svg font-family="Ahem" font-size="1.6" fill="blue" width...
+PASS Hit-test of <text> does not hit-test the "background" (w/ small font size)
 Harness: the test ran to completion.
 

third_party/blink/web_tests/flag-specific/highdpi/transforms/3d/point-mapping/3d-point-mapping-coplanar-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/transforms/3d/point-mapping/3d-point-mapping-coplanar-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/transforms/3d/point-mapping/3d-point-mapping-coplanar-expected.png
index ffab55a..8f59440 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/transforms/3d/point-mapping/3d-point-mapping-coplanar-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/transforms/3d/point-mapping/3d-point-mapping-coplanar-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/transforms/3d/point-mapping/3d-point-mapping-overlapping-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/transforms/3d/point-mapping/3d-point-mapping-overlapping-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/transforms/3d/point-mapping/3d-point-mapping-overlapping-expected.png
index bcd9562c..dfd001a 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/transforms/3d/point-mapping/3d-point-mapping-overlapping-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/transforms/3d/point-mapping/3d-point-mapping-overlapping-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/transforms/transformed-document-element-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/transforms/transformed-document-element-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/transforms/transformed-document-element-expected.txt
index bda8793..a576a26 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/transforms/transformed-document-element-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/transforms/transformed-document-element-expected.txt
@@ -1 +1,9 @@
-SUCCESS! The transform was applied to the scrollHeight!
+This is a testharness.js-based test.
+PASS Test that timezonechange event handler API is present in window
+PASS Test that the timezonechange event fires on window.ontimezonechange
+PASS Test that the timezonechange event fires on window.addEventListener('timezonechange')
+PASS Test that the timezonechange event fires on body ontimezonechange attribute
+PASS Test that the timezonechange event fires on body ontimezonechange attribute XOR window.ontimezonechange
+PASS Test properties of the fired event.
+Harness: the test ran to completion.
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/android/fullscreen/video-overlay-scroll-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/android/fullscreen/video-overlay-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/android/fullscreen/video-overlay-scroll-expected.txt
index ce39d55..e0510c60 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/android/fullscreen/video-overlay-scroll-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/android/fullscreen/video-overlay-scroll-expected.txt
@@ -1,11 +1,6 @@
 {
   "layers": [
     {
-      "name": "LayoutVideo (positioned) VIDEO id='video'",
-      "bounds": [1200, 900],
-      "drawsContent": false
-    },
-    {
       "name": "LayoutNGFlexibleBox DIV class='sizing-small phase-pre-ready state-no-source use-default-poster'",
       "bounds": [1200, 900],
       "contentsOpaque": true,

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/ancestor-overflow-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/ancestor-overflow-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/ancestor-overflow-change-expected.txt
new file mode 100644
index 0000000..53a4e38e
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/ancestor-overflow-change-expected.txt
@@ -0,0 +1,39 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV class='box'",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "transform": 2
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, 0, 1.5, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/bounds-clipped-composited-child-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/bounds-clipped-composited-child-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/bounds-clipped-composited-child-expected.txt
new file mode 100644
index 0000000..bf17eac
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/bounds-clipped-composited-child-expected.txt
@@ -0,0 +1,39 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV class='container'",
+      "bounds": [300, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "transform": 2
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [87, 12, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [-75, 0, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt
new file mode 100644
index 0000000..eb1485e4
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt
@@ -0,0 +1,61 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutImage (positioned) IMG",
+      "position": [15, 15],
+      "bounds": [75, 75],
+      "contentsOpaque": true,
+      "backgroundColor": "#000000"
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='inner'",
+      "position": [750, 180],
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#0000FF"
+    },
+    {
+      "name": "LayoutImage (positioned) IMG",
+      "position": [15, 15],
+      "bounds": [75, 75],
+      "contentsOpaque": true,
+      "backgroundColor": "#000000",
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='composited inner'",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#0000FF",
+      "transform": 2
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, 375, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [750, 180, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/bounds-ignores-hidden-dynamic-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/bounds-ignores-hidden-dynamic-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/bounds-ignores-hidden-dynamic-expected.txt
new file mode 100644
index 0000000..f457304
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/bounds-ignores-hidden-dynamic-expected.txt
@@ -0,0 +1,44 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutImage (positioned) IMG",
+      "position": [15, 15],
+      "bounds": [75, 75],
+      "contentsOpaque": true,
+      "backgroundColor": "#000000"
+    },
+    {
+      "name": "LayoutImage (positioned) IMG class='to-visible'",
+      "position": [750, 300],
+      "bounds": [75, 75],
+      "contentsOpaque": true,
+      "backgroundColor": "#000000"
+    },
+    {
+      "name": "LayoutImage (positioned) IMG",
+      "position": [15, 15],
+      "bounds": [75, 75],
+      "contentsOpaque": true,
+      "backgroundColor": "#000000",
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, 375, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt
new file mode 100644
index 0000000..eaa79b3
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt
@@ -0,0 +1,59 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='composited'",
+      "bounds": [225, 225],
+      "contentsOpaqueForText": true
+    },
+    {
+      "name": "LayoutImage (positioned) IMG class='to-visible'",
+      "position": [600, 225],
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#000000"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='composited'",
+      "bounds": [225, 225],
+      "contentsOpaqueForText": true,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow PRE id='layers'",
+      "position": [12, 12],
+      "bounds": [1176, 22],
+      "drawsContent": false
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='indicator box'",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='indicator box'",
+      "position": [0, 375],
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000"
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, 375, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/bounds-ignores-hidden-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/bounds-ignores-hidden-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/bounds-ignores-hidden-expected.txt
new file mode 100644
index 0000000..364efdb
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/bounds-ignores-hidden-expected.txt
@@ -0,0 +1,34 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [67485, 22595],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutImage (positioned) IMG",
+      "position": [15, 15],
+      "bounds": [75, 75],
+      "contentsOpaque": true,
+      "backgroundColor": "#000000"
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 878],
+      "bounds": [1178, 22]
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 878]
+    },
+    {
+      "name": "Scroll corner of LayoutView #document",
+      "position": [1178, 878],
+      "bounds": [22, 22],
+      "contentsOpaque": true
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/clip-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/clip-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/clip-expected.txt
new file mode 100644
index 0000000..ae636890
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/clip-expected.txt
@@ -0,0 +1,68 @@
+Test CSS clip with composited layers. Left and right sides should look the same.
+
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='composited box'",
+      "position": [-7, -7],
+      "bounds": [165, 165],
+      "contentsOpaqueForText": true,
+      "backgroundColor": "#666666",
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='composited inner'",
+      "bounds": [180, 180],
+      "contentsOpaqueForText": true,
+      "backgroundColor": "#00000033",
+      "transform": 4
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [30, 30, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, 0, 1.5, 1]
+      ]
+    },
+    {
+      "id": 3,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [315, 15, 0, 1]
+      ]
+    },
+    {
+      "id": 4,
+      "parent": 3,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, 0, 1.5, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/clip-inside-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/clip-inside-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/clip-inside-expected.txt
new file mode 100644
index 0000000..e0e3fb3
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/clip-inside-expected.txt
@@ -0,0 +1,68 @@
+Test CSS clip with composited layers. Left and right sides should look the same.
+
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='composited box'",
+      "position": [8, 23],
+      "bounds": [135, 120],
+      "contentsOpaque": true,
+      "backgroundColor": "#666666",
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='composited inner'",
+      "bounds": [180, 180],
+      "contentsOpaqueForText": true,
+      "backgroundColor": "#00000033",
+      "transform": 4
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [30, 30, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, 0, 1.5, 1]
+      ]
+    },
+    {
+      "id": 3,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [315, 15, 0, 1]
+      ]
+    },
+    {
+      "id": 4,
+      "parent": 3,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, 0, 1.5, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/clip-with-shadow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/clip-with-shadow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/clip-with-shadow-expected.txt
new file mode 100644
index 0000000..ca4aa2b1
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/clip-with-shadow-expected.txt
@@ -0,0 +1,66 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='composited box'",
+      "position": [-7, -7],
+      "bounds": [165, 165],
+      "contentsOpaqueForText": true,
+      "backgroundColor": "#666666",
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='composited inner'",
+      "bounds": [180, 180],
+      "contentsOpaqueForText": true,
+      "backgroundColor": "#00000033",
+      "transform": 4
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [30, 30, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, 0, 1.5, 1]
+      ]
+    },
+    {
+      "id": 3,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [315, 15, 0, 1]
+      ]
+    },
+    {
+      "id": 4,
+      "parent": 3,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, 0, 1.5, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/composited-in-columns-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/composited-in-columns-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/composited-in-columns-expected.txt
new file mode 100644
index 0000000..07bd916
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/composited-in-columns-expected.txt
@@ -0,0 +1,64 @@
+  
+   
+  
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutBlockFlow DIV class='composited block'",
+      "position": [-7, -7],
+      "bounds": [314, 89],
+      "contentsOpaqueForText": true,
+      "backgroundColor": "#0000FF",
+      "transform": 1
+    },
+    {
+      "name": "LayoutBlockFlow DIV class='composited box'",
+      "bounds": [75, 75],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "transform": 1
+    },
+    {
+      "name": "LayoutBlockFlow DIV class='composited block'",
+      "position": [-7, -7],
+      "bounds": [314, 89],
+      "contentsOpaqueForText": true,
+      "backgroundColor": "#0000FF",
+      "transform": 2
+    },
+    {
+      "name": "LayoutBlockFlow DIV class='composited box'",
+      "bounds": [75, 75],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "transform": 2
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [29, 251, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [416, 140, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/flipped-writing-mode-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/flipped-writing-mode-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/flipped-writing-mode-expected.txt
new file mode 100644
index 0000000..778a9fb4
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/flipped-writing-mode-expected.txt
@@ -0,0 +1,47 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV class='composited flipped'",
+      "bounds": [375, 300],
+      "contentsOpaque": true,
+      "backgroundColor": "#C0C0C0",
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV class='composited box'",
+      "position": [-142, 0],
+      "bounds": [292, 150],
+      "contentsOpaqueForText": true,
+      "backgroundColor": "#0000FF",
+      "transform": 2
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [27, 15, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [195, 15, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/foreground-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/foreground-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/foreground-layer-expected.txt
new file mode 100644
index 0000000..ff9ad86
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/foreground-layer-expected.txt
@@ -0,0 +1,118 @@
+ 
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='main box'",
+      "position": [-45, -45],
+      "bounds": [510, 510],
+      "contentsOpaqueForText": true,
+      "backgroundColor": "#FF0000",
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='negative child'",
+      "bounds": [75, 75],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 3
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='main box'",
+      "position": [60, 60],
+      "bounds": [300, 306],
+      "contentsOpaqueForText": true,
+      "backgroundColor": "#008000",
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='main box'",
+      "position": [-45, -45],
+      "bounds": [510, 510],
+      "contentsOpaqueForText": true,
+      "backgroundColor": "#FF0000",
+      "transform": 4
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='negative child'",
+      "bounds": [75, 75],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 6
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='main box'",
+      "position": [60, 60],
+      "bounds": [300, 300],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "transform": 4
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [57, 162, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [60, 60, 0, 1]
+      ]
+    },
+    {
+      "id": 3,
+      "parent": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, 0, 1.5, 1]
+      ]
+    },
+    {
+      "id": 4,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [573, 57, 0, 1]
+      ]
+    },
+    {
+      "id": 5,
+      "parent": 4,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [60, 60, 0, 1]
+      ]
+    },
+    {
+      "id": 6,
+      "parent": 5,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, 0, 1.5, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/foreground-offset-change-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/foreground-offset-change-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/foreground-offset-change-expected.png
new file mode 100644
index 0000000..52121513
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/foreground-offset-change-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/layer-due-to-layer-children-deep-switch-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/layer-due-to-layer-children-deep-switch-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/layer-due-to-layer-children-deep-switch-expected.txt
new file mode 100644
index 0000000..6345671
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/layer-due-to-layer-children-deep-switch-expected.txt
@@ -0,0 +1,107 @@
+
+First dump layer tree:
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    }
+  ]
+}
+
+Second dump layer tree:
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV id='greatgrandchild'",
+      "bounds": [375, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "transform": 6
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [47, 59, 0, 1]
+      ]
+    },
+    {
+      "id": 3,
+      "parent": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [15, 15, 0, 1]
+      ]
+    },
+    {
+      "id": 4,
+      "parent": 3,
+      "transform": [
+        [0.866025403784439, 0.5, 0, 0],
+        [-0.5, 0.866025403784439, 0, 0],
+        [0, 0, 1, 0],
+        [0, 0, 0, 1]
+      ],
+      "origin": [150, 150]
+    },
+    {
+      "id": 5,
+      "parent": 4,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [150, 0, 0, 1]
+      ]
+    },
+    {
+      "id": 6,
+      "parent": 5,
+      "transform": [
+        [0.5, 0, -0.866025403784439, 0.00144337567297406],
+        [0, 1, 0, 0],
+        [0.866025403784439, 0, 0.5, -0.000833333333333333],
+        [-45, 45, 150, 0.75]
+      ],
+      "origin": [187.5, 75]
+    }
+  ]
+}
+
+Third dump layer tree:
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/layer-due-to-layer-children-switch-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/layer-due-to-layer-children-switch-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/layer-due-to-layer-children-switch-expected.txt
new file mode 100644
index 0000000..d234acc
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/layer-due-to-layer-children-switch-expected.txt
@@ -0,0 +1,76 @@
+
+First dump layer tree:
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    }
+  ]
+}
+
+Second dump layer tree:
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV id='child' class='child'",
+      "bounds": [375, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "transform": 3
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [182, 59, 0, 1]
+      ]
+    },
+    {
+      "id": 3,
+      "parent": 2,
+      "transform": [
+        [0.707106781186548, 0, -0.707106781186548, 0.000785674201318386],
+        [0, 1, 0, 0],
+        [0.707106781186548, 0, 0.707106781186548, -0.000785674201318386],
+        [-75, 15, 150, 0.833333333333333]
+      ],
+      "origin": [187.5, 75]
+    }
+  ]
+}
+
+Third dump layer tree:
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/limit-layer-bounds-opacity-transition-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/limit-layer-bounds-opacity-transition-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/limit-layer-bounds-opacity-transition-expected.txt
new file mode 100644
index 0000000..f684c76
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/limit-layer-bounds-opacity-transition-expected.txt
@@ -0,0 +1,37 @@
+Test
+Fader
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV class='compositing'",
+      "bounds": [2, 2],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='test'",
+      "bounds": [162, 149],
+      "contentsOpaqueForText": true,
+      "backgroundColor": "#FFFFFF"
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/limit-layer-bounds-overflow-root-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/limit-layer-bounds-overflow-root-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/limit-layer-bounds-overflow-root-expected.txt
new file mode 100644
index 0000000..4cf7a14
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/limit-layer-bounds-overflow-root-expected.txt
@@ -0,0 +1,39 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='compositing'",
+      "bounds": [150, 150],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='indicator'",
+      "bounds": [213, 213],
+      "contentsOpaqueForText": true
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) PRE id='layers'",
+      "position": [0, 20],
+      "bounds": [324, 22]
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [32, 32, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/limit-layer-bounds-positioned-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/limit-layer-bounds-positioned-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/limit-layer-bounds-positioned-expected.txt
new file mode 100644
index 0000000..fe8ae32
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/limit-layer-bounds-positioned-expected.txt
@@ -0,0 +1,36 @@
+Text here
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='compositing'",
+      "bounds": [150, 150],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='indicator'",
+      "position": [0, 12],
+      "bounds": [225, 213],
+      "contentsOpaqueForText": true
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [44, 44, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/limit-layer-bounds-positioned-transition-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/limit-layer-bounds-positioned-transition-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/limit-layer-bounds-positioned-transition-expected.txt
new file mode 100644
index 0000000..b20c11e
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/limit-layer-bounds-positioned-transition-expected.txt
@@ -0,0 +1,37 @@
+Text here
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='compositing'",
+      "bounds": [150, 150],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='indicator'",
+      "position": [0, 12],
+      "bounds": [644, 213],
+      "contentsOpaqueForText": true,
+      "backgroundColor": "#008000"
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [44, 44, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/limit-layer-bounds-transformed-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/limit-layer-bounds-transformed-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/limit-layer-bounds-transformed-expected.txt
new file mode 100644
index 0000000..0f243b4
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/limit-layer-bounds-transformed-expected.txt
@@ -0,0 +1,37 @@
+Text here
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='compositing'",
+      "bounds": [150, 150],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='indicator'",
+      "position": [0, 12],
+      "bounds": [525, 213],
+      "contentsOpaqueForText": true,
+      "backgroundColor": "#008000"
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [194, 44, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/preserve-3d-switching-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/preserve-3d-switching-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/preserve-3d-switching-expected.txt
new file mode 100644
index 0000000..e936ed31
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/preserve-3d-switching-expected.txt
@@ -0,0 +1,105 @@
+The green box appear angled out from the yellow box and embedded in it.
+
+transform: translateZ(-100px) rotateY(45deg);
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV id='container'",
+      "bounds": [456, 456],
+      "contentsOpaqueForText": true,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='parent'",
+      "bounds": [420, 420],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFF00",
+      "transform": 4
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV",
+      "bounds": [300, 300],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "transform": 6
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [162, 108, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, -0.00133333333333333],
+        [0, 0, 0, 1]
+      ],
+      "origin": [228, 228]
+    },
+    {
+      "id": 3,
+      "parent": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [18, 18, 0, 1]
+      ],
+      "flattenInheritedTransform": false
+    },
+    {
+      "id": 4,
+      "parent": 3,
+      "transform": [
+        [0.766044443118978, -0.556670399226419, -0.32139380484327, 0],
+        [0, 0.5, -0.866025403784439, 0],
+        [0.642787609686539, 0.663413948168938, 0.383022221559489, 0],
+        [0, 0, 0, 1]
+      ],
+      "origin": [210, 210],
+      "flattenInheritedTransform": false,
+      "renderingContext": 1
+    },
+    {
+      "id": 5,
+      "parent": 4,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [60, 60, 0, 1]
+      ],
+      "flattenInheritedTransform": false,
+      "renderingContext": 1
+    },
+    {
+      "id": 6,
+      "parent": 5,
+      "transform": [
+        [0.766044443118978, 0, 0.642787609686539, 0],
+        [0, 1, 0, 0],
+        [-0.642787609686539, 0, 0.766044443118978, 0],
+        [0, 0, 75, 1]
+      ],
+      "origin": [150, 150],
+      "flattenInheritedTransform": false,
+      "renderingContext": 1
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/transformed-abs-position-inside-composited-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/transformed-abs-position-inside-composited-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/transformed-abs-position-inside-composited-expected.png
new file mode 100644
index 0000000..82d22a4
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/geometry/transformed-abs-position-inside-composited-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/accelerated-overflow-scroll-should-not-affect-perspective-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/accelerated-overflow-scroll-should-not-affect-perspective-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/accelerated-overflow-scroll-should-not-affect-perspective-expected.txt
new file mode 100644
index 0000000..8f7388fc
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/accelerated-overflow-scroll-should-not-affect-perspective-expected.txt
@@ -0,0 +1,117 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='container'",
+      "bounds": [300, 300],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='container'",
+      "bounds": [278, 278],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 278],
+      "bounds": [300, 22],
+      "contentsOpaqueForText": true,
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [278, 0],
+      "bounds": [22, 278],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='child first'",
+      "bounds": [90, 300],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "transform": 4
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='child second'",
+      "bounds": [90, 300],
+      "contentsOpaque": true,
+      "backgroundColor": "#0000FF",
+      "transform": 6
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, -0.00666666666666667],
+        [0, 0, 0, 1]
+      ],
+      "origin": [150, 150]
+    },
+    {
+      "id": 3,
+      "parent": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, 98, 0, 1]
+      ],
+      "flattenInheritedTransform": false
+    },
+    {
+      "id": 4,
+      "parent": 3,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, 0, 15, 1]
+      ],
+      "flattenInheritedTransform": false
+    },
+    {
+      "id": 5,
+      "parent": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [98, 98, 0, 1]
+      ],
+      "flattenInheritedTransform": false
+    },
+    {
+      "id": 6,
+      "parent": 5,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, 0, 30, 1]
+      ],
+      "flattenInheritedTransform": false
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/clip-content-under-overflow-controls-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/clip-content-under-overflow-controls-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/clip-content-under-overflow-controls-expected.png
new file mode 100644
index 0000000..72b516fa
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/clip-content-under-overflow-controls-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/clip-descendents-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/clip-descendents-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/clip-descendents-expected.txt
new file mode 100644
index 0000000..4d921a23
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/clip-descendents-expected.txt
@@ -0,0 +1,117 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV class='box'",
+      "bounds": [150, 225],
+      "contentsOpaque": true,
+      "backgroundColor": "#808080",
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV class='box'",
+      "bounds": [150, 225],
+      "contentsOpaque": true,
+      "backgroundColor": "#808080",
+      "transform": 4
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV class='box'",
+      "bounds": [150, 225],
+      "contentsOpaque": true,
+      "backgroundColor": "#808080",
+      "transform": 6
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV class='box'",
+      "bounds": [150, 225],
+      "contentsOpaque": true,
+      "backgroundColor": "#808080",
+      "transform": 8
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [75, 75, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, 0, 1.5, 1]
+      ]
+    },
+    {
+      "id": 3,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [363, 75, 0, 1]
+      ]
+    },
+    {
+      "id": 4,
+      "parent": 3,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, 0, 1.5, 1]
+      ]
+    },
+    {
+      "id": 5,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [75, 363, 0, 1]
+      ]
+    },
+    {
+      "id": 6,
+      "parent": 5,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, 0, 1.5, 1]
+      ]
+    },
+    {
+      "id": 7,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [363, 363, 0, 1]
+      ]
+    },
+    {
+      "id": 8,
+      "parent": 7,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, 0, 1.5, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/content-gains-scrollbars-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/content-gains-scrollbars-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/content-gains-scrollbars-expected.txt
new file mode 100644
index 0000000..44b0e1b
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/content-gains-scrollbars-expected.txt
@@ -0,0 +1,153 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='container'",
+      "bounds": [150, 150],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='container'",
+      "bounds": [128, 150],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [128, 0],
+      "bounds": [22, 150],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='vertical' class='content tall'",
+      "bounds": [15, 300],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='container'",
+      "bounds": [150, 150],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='container'",
+      "bounds": [150, 128],
+      "drawsContent": false,
+      "transform": 2
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 128],
+      "bounds": [150, 22],
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='horizontal' class='content wide'",
+      "bounds": [300, 15],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='container'",
+      "bounds": [150, 150],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 3
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='container'",
+      "bounds": [128, 128],
+      "drawsContent": false,
+      "transform": 3
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 128],
+      "bounds": [128, 22],
+      "transform": 3
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [128, 0],
+      "bounds": [22, 128],
+      "transform": 3
+    },
+    {
+      "name": "Scroll corner of LayoutNGBlockFlow (positioned) DIV class='container'",
+      "position": [128, 128],
+      "bounds": [22, 22],
+      "contentsOpaque": true,
+      "transform": 3
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='both' class='content wide tall'",
+      "bounds": [300, 300],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 3
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='corner' class='container resizeWidget'",
+      "bounds": [150, 150],
+      "contentsOpaqueForText": true,
+      "transform": 4
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='content'",
+      "bounds": [15, 15],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 4
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 20, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 20, 0, 1]
+      ]
+    },
+    {
+      "id": 3,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 20, 0, 1]
+      ]
+    },
+    {
+      "id": 4,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 20, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/content-loses-scrollbars-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/content-loses-scrollbars-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/content-loses-scrollbars-expected.txt
new file mode 100644
index 0000000..4b37548
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/content-loses-scrollbars-expected.txt
@@ -0,0 +1,105 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='container'",
+      "bounds": [150, 150],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='vertical' class='content'",
+      "bounds": [15, 15],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='container'",
+      "bounds": [150, 150],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='horizontal' class='content'",
+      "bounds": [15, 15],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='container'",
+      "bounds": [150, 150],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 3
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='both' class='content'",
+      "bounds": [15, 15],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 3
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='corner' class='container'",
+      "bounds": [150, 150],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 4
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='content'",
+      "bounds": [15, 15],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 4
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 20, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 20, 0, 1]
+      ]
+    },
+    {
+      "id": 3,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 20, 0, 1]
+      ]
+    },
+    {
+      "id": 4,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 20, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents-expected.png
index 58d03810..5750cdd 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/nested-render-surfaces-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/nested-render-surfaces-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/nested-render-surfaces-expected.png
new file mode 100644
index 0000000..779e9fc
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/nested-render-surfaces-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/overflow-auto-with-touch-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/overflow-auto-with-touch-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/overflow-auto-with-touch-expected.txt
new file mode 100644
index 0000000..30ec1052
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/overflow-auto-with-touch-expected.txt
@@ -0,0 +1,54 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV class='scroller'",
+      "bounds": [428, 428],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 428],
+      "bounds": [428, 22],
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [428, 0],
+      "bounds": [22, 428],
+      "transform": 1
+    },
+    {
+      "name": "Scroll corner of LayoutNGBlockFlow DIV class='scroller'",
+      "position": [428, 428],
+      "bounds": [22, 22],
+      "contentsOpaque": true,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV class='scroller'",
+      "bounds": [1500, 1500],
+      "contentsOpaque": true,
+      "backgroundColor": "#C0C0C0",
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/overflow-auto-with-touch-no-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/overflow-auto-with-touch-no-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/overflow-auto-with-touch-no-overflow-expected.txt
new file mode 100644
index 0000000..36ece76f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/overflow-auto-with-touch-no-overflow-expected.txt
@@ -0,0 +1,11 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/overflow-auto-with-touch-toggle-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/overflow-auto-with-touch-toggle-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/overflow-auto-with-touch-toggle-expected.txt
new file mode 100644
index 0000000..30ec1052
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/overflow-auto-with-touch-toggle-expected.txt
@@ -0,0 +1,54 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV class='scroller'",
+      "bounds": [428, 428],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 428],
+      "bounds": [428, 22],
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [428, 0],
+      "bounds": [22, 428],
+      "transform": 1
+    },
+    {
+      "name": "Scroll corner of LayoutNGBlockFlow DIV class='scroller'",
+      "position": [428, 428],
+      "bounds": [22, 22],
+      "contentsOpaque": true,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV class='scroller'",
+      "bounds": [1500, 1500],
+      "contentsOpaque": true,
+      "backgroundColor": "#C0C0C0",
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/overflow-hidden-with-touch-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/overflow-hidden-with-touch-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/overflow-hidden-with-touch-expected.txt
new file mode 100644
index 0000000..df77baf
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/overflow-hidden-with-touch-expected.txt
@@ -0,0 +1,11 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#C0C0C0"
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/overflow-overlay-with-touch-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/overflow-overlay-with-touch-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/overflow-overlay-with-touch-expected.txt
new file mode 100644
index 0000000..48b0b84
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/overflow-overlay-with-touch-expected.txt
@@ -0,0 +1,54 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV class='scroller'",
+      "bounds": [450, 450],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV class='scroller'",
+      "bounds": [1500, 1500],
+      "contentsOpaque": true,
+      "backgroundColor": "#C0C0C0",
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 428],
+      "bounds": [428, 22],
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [428, 0],
+      "bounds": [22, 428],
+      "transform": 1
+    },
+    {
+      "name": "Scroll corner of LayoutNGBlockFlow DIV class='scroller'",
+      "position": [428, 428],
+      "bounds": [22, 22],
+      "contentsOpaque": true,
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/overflow-overlay-with-touch-no-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/overflow-overlay-with-touch-no-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/overflow-overlay-with-touch-no-overflow-expected.txt
new file mode 100644
index 0000000..36ece76f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/overflow-overlay-with-touch-no-overflow-expected.txt
@@ -0,0 +1,11 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/overflow-scroll-with-touch-no-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/overflow-scroll-with-touch-no-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/overflow-scroll-with-touch-no-overflow-expected.txt
new file mode 100644
index 0000000..36ece76f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/overflow-scroll-with-touch-no-overflow-expected.txt
@@ -0,0 +1,11 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/overflow-scrollbar-gutter-layers-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/overflow-scrollbar-gutter-layers-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/overflow-scrollbar-gutter-layers-expected.txt
new file mode 100644
index 0000000..36ece76f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/overflow-scrollbar-gutter-layers-expected.txt
@@ -0,0 +1,11 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/overflow-scrollbar-layers-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/overflow-scrollbar-layers-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/overflow-scrollbar-layers-expected.txt
new file mode 100644
index 0000000..31b9271f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/overflow-scrollbar-layers-expected.txt
@@ -0,0 +1,153 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='container'",
+      "bounds": [150, 150],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='container'",
+      "bounds": [128, 150],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [128, 0],
+      "bounds": [22, 150],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='content tall'",
+      "bounds": [15, 300],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='container'",
+      "bounds": [150, 150],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='container'",
+      "bounds": [150, 128],
+      "drawsContent": false,
+      "transform": 2
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 128],
+      "bounds": [150, 22],
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='content wide'",
+      "bounds": [300, 15],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='container'",
+      "bounds": [150, 150],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 3
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='container'",
+      "bounds": [128, 128],
+      "drawsContent": false,
+      "transform": 3
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 128],
+      "bounds": [128, 22],
+      "transform": 3
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [128, 0],
+      "bounds": [22, 128],
+      "transform": 3
+    },
+    {
+      "name": "Scroll corner of LayoutNGBlockFlow (positioned) DIV class='container'",
+      "position": [128, 128],
+      "bounds": [22, 22],
+      "contentsOpaque": true,
+      "transform": 3
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='content wide tall'",
+      "bounds": [300, 300],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 3
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='container resizeWidget'",
+      "bounds": [150, 150],
+      "contentsOpaqueForText": true,
+      "transform": 4
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='content'",
+      "bounds": [15, 15],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 4
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 20, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 20, 0, 1]
+      ]
+    },
+    {
+      "id": 3,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 20, 0, 1]
+      ]
+    },
+    {
+      "id": 4,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 20, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/overflow-visible-with-touch-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/overflow-visible-with-touch-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/overflow-visible-with-touch-expected.txt
new file mode 100644
index 0000000..482accb
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/overflow-visible-with-touch-expected.txt
@@ -0,0 +1,27 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1512, 1512],
+      "contentsOpaque": true,
+      "backgroundColor": "#C0C0C0"
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 878],
+      "bounds": [1178, 22]
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 878]
+    },
+    {
+      "name": "Scroll corner of LayoutView #document",
+      "position": [1178, 878],
+      "bounds": [22, 22],
+      "contentsOpaque": true
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/relpos-under-abspos-border-radius-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/relpos-under-abspos-border-radius-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/relpos-under-abspos-border-radius-expected.png
new file mode 100644
index 0000000..89be6905
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/relpos-under-abspos-border-radius-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/reparented-scrollbars-non-sc-anc-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/reparented-scrollbars-non-sc-anc-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/reparented-scrollbars-non-sc-anc-expected.txt
new file mode 100644
index 0000000..43224eb
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/reparented-scrollbars-non-sc-anc-expected.txt
@@ -0,0 +1,51 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1812, 1232],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "bounds": [1800, 1500],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "bounds": [1800, 15000],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1790, 0],
+      "bounds": [10, 1500],
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 890],
+      "bounds": [1190, 10]
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1190, 0],
+      "bounds": [10, 890]
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/resize-painting-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/resize-painting-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/resize-painting-expected.txt
new file mode 100644
index 0000000..3edc78d
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/resize-painting-expected.txt
@@ -0,0 +1,28 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV class='resizable composited box'",
+      "bounds": [150, 150],
+      "contentsOpaqueForText": true,
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [27, 15, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/rotate-then-clip-effect-interleave-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/rotate-then-clip-effect-interleave-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/rotate-then-clip-effect-interleave-expected.png
new file mode 100644
index 0000000..9e830f1
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/rotate-then-clip-effect-interleave-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/rotate-then-clip-effect-interleave-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/rotate-then-clip-effect-interleave-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/rotate-then-clip-effect-interleave-expected.txt
new file mode 100644
index 0000000..a58aee95
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/rotate-then-clip-effect-interleave-expected.txt
@@ -0,0 +1,81 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV",
+      "bounds": [360, 360],
+      "contentsOpaqueForText": true,
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV",
+      "bounds": [600, 600],
+      "contentsOpaque": true,
+      "backgroundColor": "#0000FF",
+      "transform": 3
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV",
+      "position": [30, 0],
+      "bounds": [600, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#00FFFF",
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV",
+      "bounds": [150, 600],
+      "contentsOpaque": true,
+      "backgroundColor": "#FF00FF",
+      "transform": 4
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [162, 150, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [0.707106781186548, 0.707106781186548, 0, 0],
+        [-0.707106781186548, 0.707106781186548, 0, 0],
+        [0, 0, 1, 0],
+        [0, 0, 0, 1]
+      ],
+      "origin": [180, 180]
+    },
+    {
+      "id": 3,
+      "parent": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [30, 30, 0, 1]
+      ]
+    },
+    {
+      "id": 4,
+      "parent": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [30, 30, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/rotate-then-clip-z-order-interleave-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/rotate-then-clip-z-order-interleave-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/rotate-then-clip-z-order-interleave-expected.txt
new file mode 100644
index 0000000..798141a0
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/rotate-then-clip-z-order-interleave-expected.txt
@@ -0,0 +1,54 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV",
+      "bounds": [300, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV",
+      "bounds": [300, 33],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFF00",
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV",
+      "bounds": [75, 300],
+      "contentsOpaque": true,
+      "backgroundColor": "#FF0000",
+      "transform": 2
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [162, 150, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [0.707106781186548, 0.707106781186548, 0, 0],
+        [-0.707106781186548, 0.707106781186548, 0, 0],
+        [0, 0, 1, 0],
+        [0, 0, 0, 1]
+      ],
+      "origin": [225, 75]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/scrollbar-layer-placement-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/scrollbar-layer-placement-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/scrollbar-layer-placement-expected.txt
new file mode 100644
index 0000000..c2379fc
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/scrollbar-layer-placement-expected.txt
@@ -0,0 +1,201 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='outer A'",
+      "position": [-32, -32],
+      "bounds": [529, 442],
+      "contentsOpaqueForText": true,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='scroller'",
+      "position": [7, 7],
+      "bounds": [330, 240],
+      "drawsContent": false,
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='scroller'",
+      "position": [7, 7],
+      "bounds": [330, 354],
+      "contentsOpaque": true,
+      "backgroundColor": "#DDDDDD",
+      "transform": 2
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [328, 7],
+      "bounds": [10, 240],
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='outer B'",
+      "position": [-32, -32],
+      "bounds": [529, 442],
+      "contentsOpaqueForText": true,
+      "transform": 3
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV class='scroller'",
+      "position": [7, 7],
+      "bounds": [330, 240],
+      "drawsContent": false,
+      "transform": 4
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV class='scroller'",
+      "position": [7, 7],
+      "bounds": [330, 354],
+      "contentsOpaque": true,
+      "backgroundColor": "#DDDDDD",
+      "transform": 4
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [328, 7],
+      "bounds": [10, 240],
+      "transform": 4
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='outer C'",
+      "position": [-32, -32],
+      "bounds": [529, 442],
+      "contentsOpaqueForText": true,
+      "transform": 5
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV class='scroller'",
+      "position": [8, 8],
+      "bounds": [330, 240],
+      "drawsContent": false,
+      "transform": 6
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV class='scroller'",
+      "position": [8, 8],
+      "bounds": [330, 354],
+      "contentsOpaque": true,
+      "backgroundColor": "#DDDDDD",
+      "transform": 6
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [328, 7],
+      "bounds": [10, 240],
+      "transform": 6
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='outer D'",
+      "position": [-32, -32],
+      "bounds": [529, 442],
+      "contentsOpaqueForText": true,
+      "transform": 7
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV class='scroller'",
+      "position": [8, 8],
+      "bounds": [330, 240],
+      "drawsContent": false,
+      "transform": 8
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV class='scroller'",
+      "position": [8, 8],
+      "bounds": [330, 354],
+      "contentsOpaque": true,
+      "backgroundColor": "#DDDDDD",
+      "transform": 8
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [328, 7],
+      "bounds": [10, 240],
+      "transform": 8
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [32, 32, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [62, 62, 0, 1]
+      ]
+    },
+    {
+      "id": 3,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [555, 32, 0, 1]
+      ]
+    },
+    {
+      "id": 4,
+      "parent": 3,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [62, 62, 0, 1]
+      ]
+    },
+    {
+      "id": 5,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [32, 468, 0, 1]
+      ]
+    },
+    {
+      "id": 6,
+      "parent": 5,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [60, 60, 0, 1]
+      ]
+    },
+    {
+      "id": 7,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [555, 468, 0, 1]
+      ]
+    },
+    {
+      "id": 8,
+      "parent": 7,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [60, 60, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/scrollbar-layer-placement-negative-z-index-child-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/scrollbar-layer-placement-negative-z-index-child-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/scrollbar-layer-placement-negative-z-index-child-expected.txt
new file mode 100644
index 0000000..59fb581
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/scrollbar-layer-placement-negative-z-index-child-expected.txt
@@ -0,0 +1,75 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='outer'",
+      "position": [-32, -32],
+      "bounds": [529, 442],
+      "contentsOpaqueForText": true,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='content'",
+      "position": [25, 25],
+      "bounds": [294, 318],
+      "contentsOpaque": true,
+      "backgroundColor": "#DDDDDD",
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV class='scroller'",
+      "position": [-46, -46],
+      "bounds": [436, 346],
+      "contentsOpaqueForText": true,
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV class='scroller'",
+      "position": [7, 7],
+      "bounds": [330, 240],
+      "drawsContent": false,
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV class='scroller'",
+      "position": [7, 7],
+      "bounds": [330, 354],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "transform": 2
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [328, 7],
+      "bounds": [10, 240],
+      "transform": 2
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [32, 32, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [62, 62, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/scrollbar-layer-placement-negative-z-index-child-positioned-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/scrollbar-layer-placement-negative-z-index-child-positioned-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/scrollbar-layer-placement-negative-z-index-child-positioned-expected.txt
new file mode 100644
index 0000000..63d1996
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/scrollbar-layer-placement-negative-z-index-child-positioned-expected.txt
@@ -0,0 +1,75 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='outer'",
+      "position": [-32, -32],
+      "bounds": [529, 442],
+      "contentsOpaqueForText": true,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='content'",
+      "position": [25, 25],
+      "bounds": [294, 318],
+      "contentsOpaque": true,
+      "backgroundColor": "#DDDDDD",
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='scroller'",
+      "position": [-46, -46],
+      "bounds": [436, 346],
+      "contentsOpaqueForText": true,
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='scroller'",
+      "position": [7, 7],
+      "bounds": [330, 240],
+      "drawsContent": false,
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='scroller'",
+      "position": [7, 7],
+      "bounds": [330, 354],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "transform": 2
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [328, 7],
+      "bounds": [10, 240],
+      "transform": 2
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [32, 32, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [62, 62, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/scrollbar-painting-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/scrollbar-painting-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/scrollbar-painting-expected.png
index 07fd07f..2eea9734 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/scrollbar-painting-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/scrollbar-painting-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/scrolling-content-clip-to-viewport-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/scrolling-content-clip-to-viewport-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/scrolling-content-clip-to-viewport-expected.txt
new file mode 100644
index 0000000..11ea1a8
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/scrolling-content-clip-to-viewport-expected.txt
@@ -0,0 +1,34 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV class='scroller'",
+      "bounds": [458, 488],
+      "drawsContent": false
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 488],
+      "bounds": [480, 22],
+      "contentsOpaqueForText": true
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [458, 0],
+      "bounds": [22, 488]
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='column'",
+      "position": [15, 15],
+      "bounds": [426, 1806],
+      "contentsOpaque": true,
+      "backgroundColor": "#C0C0C0"
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/textarea-scroll-touch-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/textarea-scroll-touch-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/textarea-scroll-touch-expected.txt
new file mode 100644
index 0000000..48fc44f5
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/textarea-scroll-touch-expected.txt
@@ -0,0 +1,136 @@
+ 
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGTextControlMultiLine TEXTAREA",
+      "position": [2, 2],
+      "bounds": [284, 186],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "Scroll corner of LayoutNGTextControlMultiLine TEXTAREA",
+      "position": [263, 143],
+      "bounds": [44, 44],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGTextControlMultiLine TEXTAREA",
+      "position": [2, 2],
+      "bounds": [284, 492],
+      "contentsOpaque": true,
+      "backgroundColor": "#CCCCCC",
+      "transform": 2
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [286, 1],
+      "bounds": [22, 164],
+      "transform": 1
+    },
+    {
+      "name": "Scroll corner of LayoutNGTextControlMultiLine TEXTAREA",
+      "position": [285, 165],
+      "bounds": [22, 22],
+      "contentsOpaque": true,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGTextControlMultiLine TEXTAREA",
+      "position": [4, 5],
+      "bounds": [282, 486],
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGTextControlMultiLine TEXTAREA",
+      "position": [2, 2],
+      "bounds": [284, 186],
+      "drawsContent": false,
+      "transform": 3
+    },
+    {
+      "name": "Scroll corner of LayoutNGTextControlMultiLine TEXTAREA",
+      "position": [263, 143],
+      "bounds": [44, 44],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 3
+    },
+    {
+      "name": "LayoutNGTextControlMultiLine TEXTAREA",
+      "position": [2, 2],
+      "bounds": [284, 492],
+      "contentsOpaque": true,
+      "backgroundColor": "#CCCCCC",
+      "transform": 4
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [286, 1],
+      "bounds": [22, 164],
+      "transform": 3
+    },
+    {
+      "name": "Scroll corner of LayoutNGTextControlMultiLine TEXTAREA",
+      "position": [285, 165],
+      "bounds": [22, 22],
+      "contentsOpaque": true,
+      "transform": 3
+    },
+    {
+      "name": "LayoutNGTextControlMultiLine TEXTAREA",
+      "position": [4, 5],
+      "bounds": [282, 486],
+      "transform": 4
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [27, 27, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -75, 0, 1]
+      ]
+    },
+    {
+      "id": 3,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [372, 27, 0, 1]
+      ]
+    },
+    {
+      "id": 4,
+      "parent": 3,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -75, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/universal-accelerated-overflow-scroll-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/universal-accelerated-overflow-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/universal-accelerated-overflow-scroll-expected.txt
new file mode 100644
index 0000000..2aad5ae
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/compositing/overflow/universal-accelerated-overflow-scroll-expected.txt
@@ -0,0 +1,847 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 3024],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='container-absolute-grandchildren-not-contained' class='overflow'",
+      "position": [3, 3],
+      "bounds": [128, 128],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [3, 131],
+      "bounds": [150, 22],
+      "contentsOpaqueForText": true,
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [131, 3],
+      "bounds": [22, 128],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='container-absolute-grandchildren-not-contained' class='overflow'",
+      "position": [3, 9],
+      "bounds": [128, 204],
+      "contentsOpaqueForText": true,
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='positioned-absolute-grandchildren-not-contained' class='positionAbsolute positioned'",
+      "position": [15, 113],
+      "bounds": [158, 418],
+      "contentsOpaqueForText": true
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='container-absolute-grandchildren' class='positionAbsolute overflow'",
+      "position": [3, 3],
+      "bounds": [128, 128],
+      "drawsContent": false,
+      "transform": 3
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [3, 131],
+      "bounds": [128, 22],
+      "transform": 3
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [131, 3],
+      "bounds": [22, 128],
+      "transform": 3
+    },
+    {
+      "name": "Scroll corner of LayoutNGBlockFlow (positioned) DIV id='container-absolute-grandchildren' class='positionAbsolute overflow'",
+      "position": [326, 15],
+      "bounds": [385, 156],
+      "contentsOpaqueForText": true
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='container-absolute-grandchildren' class='positionAbsolute overflow'",
+      "position": [3, 9],
+      "bounds": [158, 204],
+      "contentsOpaqueForText": true,
+      "transform": 4
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='container-absolute-not-contained' class='overflow'",
+      "position": [3, 3],
+      "bounds": [128, 128],
+      "drawsContent": false,
+      "transform": 5
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [3, 131],
+      "bounds": [150, 22],
+      "contentsOpaqueForText": true,
+      "transform": 5
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [131, 3],
+      "bounds": [22, 128],
+      "transform": 5
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='positioned-absolute-not-contained' class='positionAbsolute positioned'",
+      "position": [413, 113],
+      "bounds": [120, 60],
+      "contentsOpaque": true,
+      "backgroundColor": "#800080"
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV id='scrolled-absolute-not-contained' class='scrolled'",
+      "position": [9, 9],
+      "bounds": [113, 204],
+      "contentsOpaqueForText": true,
+      "transform": 6
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='container-absolute-sibling-grandchildren-not-contained' class='overflow'",
+      "position": [3, 3],
+      "bounds": [128, 128],
+      "drawsContent": false,
+      "transform": 7
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [3, 131],
+      "bounds": [150, 22],
+      "contentsOpaqueForText": true,
+      "transform": 7
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [131, 3],
+      "bounds": [22, 128],
+      "transform": 7
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='container-absolute-sibling-grandchildren-not-contained' class='overflow'",
+      "position": [3, 9],
+      "bounds": [128, 204],
+      "contentsOpaqueForText": true,
+      "transform": 8
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='positioned-absolute-sibling-grandchildren-not-contained' class='positionAbsolute positioned'",
+      "position": [593, 113],
+      "bounds": [120, 60],
+      "contentsOpaque": true,
+      "backgroundColor": "#800080"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='container-absolute-sibling-grandchildren' class='positionAbsolute overflow'",
+      "position": [3, 3],
+      "bounds": [128, 128],
+      "drawsContent": false,
+      "transform": 9
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [3, 131],
+      "bounds": [128, 22],
+      "transform": 9
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [131, 3],
+      "bounds": [22, 128],
+      "transform": 9
+    },
+    {
+      "name": "Scroll corner of LayoutNGBlockFlow (positioned) DIV id='container-absolute-sibling-grandchildren' class='positionAbsolute overflow'",
+      "position": [146, 195],
+      "bounds": [385, 156],
+      "contentsOpaqueForText": true
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='container-absolute-sibling-grandchildren' class='positionAbsolute overflow'",
+      "position": [3, 9],
+      "bounds": [158, 204],
+      "contentsOpaqueForText": true,
+      "transform": 10
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='container-absolute-sibling-not-contained' class='overflow'",
+      "position": [3, 3],
+      "bounds": [128, 128],
+      "drawsContent": false,
+      "transform": 11
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [3, 131],
+      "bounds": [150, 22],
+      "contentsOpaqueForText": true,
+      "transform": 11
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [131, 3],
+      "bounds": [22, 128],
+      "transform": 11
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='positioned-absolute-sibling-not-contained' class='positionAbsolute positioned'",
+      "position": [195, 293],
+      "bounds": [158, 238],
+      "contentsOpaqueForText": true
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV id='scrolled-absolute-sibling-not-contained' class='scrolled'",
+      "position": [9, 9],
+      "bounds": [113, 162],
+      "contentsOpaqueForText": true,
+      "transform": 12
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='container-absolute-sibling' class='positionAbsolute overflow'",
+      "position": [3, 3],
+      "bounds": [128, 128],
+      "drawsContent": false,
+      "transform": 13
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [3, 131],
+      "bounds": [128, 22],
+      "transform": 13
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [131, 3],
+      "bounds": [22, 128],
+      "transform": 13
+    },
+    {
+      "name": "Scroll corner of LayoutNGBlockFlow (positioned) DIV id='container-absolute-sibling' class='positionAbsolute overflow'",
+      "position": [506, 195],
+      "bounds": [205, 156],
+      "contentsOpaqueForText": true
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='positioned-absolute-sibling' class='positionAbsolute positioned'",
+      "position": [9, 9],
+      "bounds": [152, 162],
+      "contentsOpaqueForText": true,
+      "transform": 14
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='container-absolute' class='positionAbsolute overflow'",
+      "position": [3, 3],
+      "bounds": [128, 128],
+      "drawsContent": false,
+      "transform": 15
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [3, 131],
+      "bounds": [128, 22],
+      "transform": 15
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [131, 3],
+      "bounds": [22, 128],
+      "transform": 15
+    },
+    {
+      "name": "Scroll corner of LayoutNGBlockFlow (positioned) DIV id='container-absolute' class='positionAbsolute overflow'",
+      "position": [555, 326],
+      "bounds": [156, 205],
+      "contentsOpaqueForText": true
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='positioned-absolute' class='positionAbsolute positioned'",
+      "position": [9, 9],
+      "bounds": [152, 162],
+      "contentsOpaqueForText": true,
+      "transform": 16
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='container-fixed-sibling-grandchildren' class='positionAbsolute overflow'",
+      "position": [3, 3],
+      "bounds": [128, 128],
+      "drawsContent": false,
+      "transform": 17
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [3, 131],
+      "bounds": [150, 22],
+      "contentsOpaqueForText": true,
+      "transform": 17
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [131, 3],
+      "bounds": [22, 128],
+      "transform": 17
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='container-fixed-sibling-grandchildren' class='positionAbsolute overflow'",
+      "position": [3, 9],
+      "bounds": [128, 204],
+      "contentsOpaqueForText": true,
+      "transform": 18
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='positioned-fixed-sibling-grandchildren' class='positionFixed positioned'",
+      "bounds": [120, 60],
+      "contentsOpaque": true,
+      "backgroundColor": "#800080",
+      "transform": 19
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='container-fixed-sibling' class='positionAbsolute overflow'",
+      "position": [3, 3],
+      "bounds": [128, 128],
+      "drawsContent": false,
+      "transform": 20
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [3, 131],
+      "bounds": [150, 22],
+      "contentsOpaqueForText": true,
+      "transform": 20
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [131, 3],
+      "bounds": [22, 128],
+      "transform": 20
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='positioned-fixed-sibling' class='positionFixed positioned'",
+      "bounds": [120, 60],
+      "contentsOpaque": true,
+      "backgroundColor": "#800080",
+      "transform": 21
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV id='scrolled-fixed-sibling' class='scrolled'",
+      "position": [9, 9],
+      "bounds": [113, 162],
+      "contentsOpaqueForText": true,
+      "transform": 22
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='container-fixed-grandchildren' class='positionAbsolute overflow'",
+      "position": [3, 3],
+      "bounds": [128, 128],
+      "drawsContent": false,
+      "transform": 23
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [3, 131],
+      "bounds": [150, 22],
+      "contentsOpaqueForText": true,
+      "transform": 23
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [131, 3],
+      "bounds": [22, 128],
+      "transform": 23
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='container-fixed-grandchildren' class='positionAbsolute overflow'",
+      "position": [3, 9],
+      "bounds": [128, 204],
+      "contentsOpaqueForText": true,
+      "transform": 24
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='positioned-fixed-grandchildren' class='positionFixed positioned'",
+      "bounds": [120, 60],
+      "contentsOpaque": true,
+      "backgroundColor": "#800080",
+      "transform": 25
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='container-fixed' class='positionAbsolute overflow'",
+      "position": [3, 3],
+      "bounds": [128, 128],
+      "drawsContent": false,
+      "transform": 26
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [3, 131],
+      "bounds": [150, 22],
+      "contentsOpaqueForText": true,
+      "transform": 26
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [131, 3],
+      "bounds": [22, 128],
+      "transform": 26
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='positioned-fixed' class='positionFixed positioned'",
+      "bounds": [120, 60],
+      "contentsOpaque": true,
+      "backgroundColor": "#800080",
+      "transform": 27
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV id='scrolled-fixed' class='scrolled'",
+      "position": [9, 9],
+      "bounds": [113, 162],
+      "contentsOpaqueForText": true,
+      "transform": 28
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='sibling-absolute-sibling-grandchildren-not-contained' class='positionFixed sibling'",
+      "bounds": [75, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "transform": 29
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='sibling-absolute-sibling-grandchildren' class='positionFixed sibling'",
+      "bounds": [75, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "transform": 30
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='sibling-absolute-sibling-not-contained' class='positionFixed sibling'",
+      "bounds": [75, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "transform": 31
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='sibling-absolute-sibling' class='positionFixed sibling'",
+      "bounds": [75, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "transform": 32
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='sibling-fixed-sibling-grandchildren' class='positionFixed sibling'",
+      "bounds": [75, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "transform": 33
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='sibling-fixed-sibling' class='positionFixed sibling'",
+      "bounds": [75, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "transform": 34
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV id='scrolled-absolute-grandchildren-not-contained' class='scrolled onTop'",
+      "position": [9, 177],
+      "bounds": [113, 36],
+      "contentsOpaque": true,
+      "backgroundColor": "#0000FF",
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV id='scrolled-absolute-sibling-grandchildren-not-contained' class='scrolled onTop'",
+      "position": [9, 93],
+      "bounds": [113, 120],
+      "contentsOpaqueForText": true,
+      "transform": 8
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV id='scrolled-absolute-sibling-grandchildren' class='scrolled onTop'",
+      "position": [9, 93],
+      "bounds": [113, 120],
+      "contentsOpaqueForText": true,
+      "transform": 10
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV id='scrolled-absolute-sibling-not-contained' class='scrolled onTop'",
+      "position": [9, 93],
+      "bounds": [113, 120],
+      "contentsOpaqueForText": true,
+      "transform": 12
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV id='scrolled-absolute-sibling' class='scrolled onTop'",
+      "position": [9, 93],
+      "bounds": [113, 120],
+      "contentsOpaqueForText": true,
+      "transform": 14
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV id='scrolled-absolute' class='scrolled onTop'",
+      "position": [9, 93],
+      "bounds": [113, 120],
+      "contentsOpaqueForText": true,
+      "transform": 16
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV id='scrolled-fixed-sibling-grandchildren' class='scrolled onTop'",
+      "position": [9, 93],
+      "bounds": [113, 120],
+      "contentsOpaqueForText": true,
+      "transform": 18
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV id='scrolled-fixed-sibling' class='scrolled onTop'",
+      "position": [9, 93],
+      "bounds": [113, 120],
+      "contentsOpaqueForText": true,
+      "transform": 22
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV id='scrolled-fixed-grandchildren' class='scrolled onTop'",
+      "position": [9, 93],
+      "bounds": [113, 120],
+      "contentsOpaqueForText": true,
+      "transform": 24
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV id='scrolled-fixed' class='scrolled onTop'",
+      "position": [9, 93],
+      "bounds": [113, 120],
+      "contentsOpaqueForText": true,
+      "transform": 28
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [15, 15, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -88, 0, 1]
+      ]
+    },
+    {
+      "id": 3,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [195, 15, 0, 1]
+      ]
+    },
+    {
+      "id": 4,
+      "parent": 3,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -88, 0, 1]
+      ]
+    },
+    {
+      "id": 5,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [375, 15, 0, 1]
+      ]
+    },
+    {
+      "id": 6,
+      "parent": 5,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -88, 0, 1]
+      ]
+    },
+    {
+      "id": 7,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [555, 15, 0, 1]
+      ]
+    },
+    {
+      "id": 8,
+      "parent": 7,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -88, 0, 1]
+      ]
+    },
+    {
+      "id": 9,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [15, 195, 0, 1]
+      ]
+    },
+    {
+      "id": 10,
+      "parent": 9,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -88, 0, 1]
+      ]
+    },
+    {
+      "id": 11,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [195, 195, 0, 1]
+      ]
+    },
+    {
+      "id": 12,
+      "parent": 11,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -88, 0, 1]
+      ]
+    },
+    {
+      "id": 13,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [375, 195, 0, 1]
+      ]
+    },
+    {
+      "id": 14,
+      "parent": 13,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -88, 0, 1]
+      ]
+    },
+    {
+      "id": 15,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [555, 195, 0, 1]
+      ]
+    },
+    {
+      "id": 16,
+      "parent": 15,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -88, 0, 1]
+      ]
+    },
+    {
+      "id": 17,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [15, 375, 0, 1]
+      ]
+    },
+    {
+      "id": 18,
+      "parent": 17,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -88, 0, 1]
+      ]
+    },
+    {
+      "id": 19,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [53, 473, 0, 1]
+      ]
+    },
+    {
+      "id": 20,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [195, 375, 0, 1]
+      ]
+    },
+    {
+      "id": 21,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [233, 473, 0, 1]
+      ]
+    },
+    {
+      "id": 22,
+      "parent": 20,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -88, 0, 1]
+      ]
+    },
+    {
+      "id": 23,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [375, 375, 0, 1]
+      ]
+    },
+    {
+      "id": 24,
+      "parent": 23,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -88, 0, 1]
+      ]
+    },
+    {
+      "id": 25,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [413, 473, 0, 1]
+      ]
+    },
+    {
+      "id": 26,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [555, 375, 0, 1]
+      ]
+    },
+    {
+      "id": 27,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [593, 473, 0, 1]
+      ]
+    },
+    {
+      "id": 28,
+      "parent": 26,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -88, 0, 1]
+      ]
+    },
+    {
+      "id": 29,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [563, 30, 0, 1]
+      ]
+    },
+    {
+      "id": 30,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [23, 210, 0, 1]
+      ]
+    },
+    {
+      "id": 31,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [203, 210, 0, 1]
+      ]
+    },
+    {
+      "id": 32,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [383, 210, 0, 1]
+      ]
+    },
+    {
+      "id": 33,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [23, 390, 0, 1]
+      ]
+    },
+    {
+      "id": 34,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [203, 390, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/4776765-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/4776765-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/4776765-expected.png
index 24cb823..84e29d2 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/4776765-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/4776765-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/4776765-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/4776765-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/4776765-expected.txt
new file mode 100644
index 0000000..01519e58
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/4776765-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [8, 59, 1184, 89]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/animation/opacity-animation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/animation/opacity-animation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/animation/opacity-animation-expected.txt
new file mode 100644
index 0000000..5093602
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/animation/opacity-animation-expected.txt
@@ -0,0 +1,29 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='target'",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#808080",
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/animation/transform-animation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/animation/transform-animation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/animation/transform-animation-expected.txt
new file mode 100644
index 0000000..738fd28
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/animation/transform-animation-expected.txt
@@ -0,0 +1,39 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='target'",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#808080",
+      "transform": 2
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [150, 0, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/animated-svg-background-offscreen-firstline-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/animated-svg-background-offscreen-firstline-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/animated-svg-background-offscreen-firstline-expected.txt
new file mode 100644
index 0000000..df75667d
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/animated-svg-background-offscreen-firstline-expected.txt
@@ -0,0 +1,39 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [3012, 3024],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 878],
+      "bounds": [1178, 22]
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 878]
+    },
+    {
+      "name": "Scroll corner of LayoutView #document",
+      "position": [1178, 878],
+      "bounds": [22, 22],
+      "contentsOpaque": true
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -1500, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/background-currentColor-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/background-currentColor-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/background-currentColor-repaint-expected.txt
new file mode 100644
index 0000000..d7618ea
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/background-currentColor-repaint-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 162, 150, 150],
+        [12, 12, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/background-generated-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/background-generated-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/background-generated-expected.txt
new file mode 100644
index 0000000..2262b6f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/background-generated-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 150, 450]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/background-image-paint-invalidation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/background-image-paint-invalidation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/background-image-paint-invalidation-expected.txt
new file mode 100644
index 0000000..49c9431
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/background-image-paint-invalidation-expected.txt
@@ -0,0 +1,30 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1212, 3024],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 1212, 3024]
+      ]
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 878],
+      "bounds": [1178, 22]
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 878]
+    },
+    {
+      "name": "Scroll corner of LayoutView #document",
+      "position": [1178, 878],
+      "bounds": [22, 22],
+      "contentsOpaque": true
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/background-misaligned-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/background-misaligned-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/background-misaligned-expected.txt
index 2f206e6..11371988 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/background-misaligned-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/background-misaligned-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/background-resize-height-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/background-resize-height-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/background-resize-height-expected.txt
new file mode 100644
index 0000000..44a445e8
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/background-resize-height-expected.txt
@@ -0,0 +1,132 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='test image'",
+      "position": [12, 12],
+      "bounds": [165, 66],
+      "contentsOpaque": true,
+      "invalidations": [
+        [75, 0, 90, 66],
+        [0, 60, 90, 6]
+      ]
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='test image size-contain'",
+      "position": [162, 12],
+      "bounds": [165, 66],
+      "contentsOpaque": true,
+      "invalidations": [
+        [0, 0, 90, 66],
+        [75, 60, 90, 6]
+      ]
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='test image percent-height'",
+      "position": [312, 12],
+      "bounds": [165, 66],
+      "contentsOpaque": true,
+      "invalidations": [
+        [0, 0, 90, 66],
+        [75, 60, 90, 6]
+      ]
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='test image bottom'",
+      "position": [462, 12],
+      "bounds": [165, 66],
+      "contentsOpaque": true,
+      "invalidations": [
+        [75, 0, 90, 66],
+        [0, 0, 90, 66]
+      ]
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='test image no-repeat'",
+      "position": [612, 12],
+      "bounds": [165, 66],
+      "contentsOpaqueForText": true,
+      "invalidations": [
+        [75, 0, 90, 66],
+        [0, 60, 90, 6]
+      ]
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='test image repeat-round'",
+      "bounds": [90, 66],
+      "contentsOpaque": true,
+      "backfaceVisibility": "hidden",
+      "invalidations": [
+        [0, 0, 90, 66]
+      ],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='test generated'",
+      "position": [12, 162],
+      "bounds": [165, 66],
+      "contentsOpaque": true,
+      "invalidations": [
+        [75, 0, 90, 66],
+        [0, 0, 90, 66]
+      ]
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='test generated size-contain'",
+      "position": [162, 162],
+      "bounds": [240, 66],
+      "contentsOpaqueForText": true,
+      "invalidations": [
+        [150, 0, 90, 66],
+        [0, 0, 90, 66]
+      ]
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='test generated top'",
+      "position": [387, 162],
+      "bounds": [165, 66],
+      "contentsOpaqueForText": true,
+      "invalidations": [
+        [75, 0, 90, 66],
+        [0, 0, 90, 66]
+      ]
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='test generated center'",
+      "position": [537, 162],
+      "bounds": [165, 66],
+      "contentsOpaque": true,
+      "invalidations": [
+        [75, 0, 90, 66],
+        [0, 0, 90, 66]
+      ]
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='test generated repeat-space'",
+      "position": [687, 162],
+      "bounds": [165, 66],
+      "contentsOpaque": true,
+      "invalidations": [
+        [75, 0, 90, 66],
+        [0, 0, 90, 66]
+      ]
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [762, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/background-shorthand-with-gradient-and-height-changes-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/background-shorthand-with-gradient-and-height-changes-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/background-shorthand-with-gradient-and-height-changes-expected.txt
new file mode 100644
index 0000000..cc38787
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/background-shorthand-with-gradient-and-height-changes-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 1176, 750]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/background-size-auto-with-gradient-and-height-changes-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/background-size-auto-with-gradient-and-height-changes-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/background-size-auto-with-gradient-and-height-changes-expected.txt
new file mode 100644
index 0000000..cc38787
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/background-size-auto-with-gradient-and-height-changes-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 1176, 750]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/backgroundSizeRepaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/backgroundSizeRepaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/backgroundSizeRepaint-expected.txt
new file mode 100644
index 0000000..ac89135
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/backgroundSizeRepaint-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [28, 493, 301, 91],
+        [28, 253, 301, 91]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/body-background-image-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/body-background-image-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/body-background-image-expected.txt
new file mode 100644
index 0000000..2884a090
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/body-background-image-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 360, 1176, 426]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/change-text-content-and-background-color-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/change-text-content-and-background-color-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/change-text-content-and-background-color-expected.txt
new file mode 100644
index 0000000..1ef00b4
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/change-text-content-and-background-color-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 366, 100]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/composited-background-on-both-layers-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/composited-background-on-both-layers-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/composited-background-on-both-layers-expected.txt
new file mode 100644
index 0000000..e792eab
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/composited-background-on-both-layers-expected.txt
@@ -0,0 +1,63 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='target'",
+      "bounds": [360, 360],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "invalidations": [
+        [0, 0, 360, 360]
+      ],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='target'",
+      "position": [30, 30],
+      "bounds": [278, 278],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='target'",
+      "position": [30, 30],
+      "bounds": [278, 4500],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "invalidations": [
+        [0, 0, 278, 4500]
+      ],
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [30, 308],
+      "bounds": [300, 22],
+      "contentsOpaqueForText": true,
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [308, 30],
+      "bounds": [22, 278],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/full-viewport-repaint-for-background-attachment-fixed-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/full-viewport-repaint-for-background-attachment-fixed-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/full-viewport-repaint-for-background-attachment-fixed-expected.txt
new file mode 100644
index 0000000..142c9792
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/full-viewport-repaint-for-background-attachment-fixed-expected.txt
@@ -0,0 +1,26 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 7524],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 1200, 7524]
+      ],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -1500, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/html-background-image-change-size-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/html-background-image-change-size-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/html-background-image-change-size-expected.txt
new file mode 100644
index 0000000..d5c7d6a
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/html-background-image-change-size-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 1200, 900]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/html-background-image-content-box-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/html-background-image-content-box-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/html-background-image-content-box-expected.txt
new file mode 100644
index 0000000..d5c7d6a
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/html-background-image-content-box-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 1200, 900]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/multiple-backgrounds-style-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/multiple-backgrounds-style-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/multiple-backgrounds-style-change-expected.txt
new file mode 100644
index 0000000..b5c6d85
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/multiple-backgrounds-style-change-expected.txt
@@ -0,0 +1,38 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='test' class='composited box'",
+      "bounds": [303, 303],
+      "contentsOpaqueForText": true,
+      "transform": 2
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [75, 75, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/no-repaint-for-composited-background-attachment-fixed-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/no-repaint-for-composited-background-attachment-fixed-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/no-repaint-for-composited-background-attachment-fixed-expected.txt
new file mode 100644
index 0000000..8100c125
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/no-repaint-for-composited-background-attachment-fixed-expected.txt
@@ -0,0 +1,27 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow HTML",
+      "bounds": [1200, 7524],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -1500, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/no-repaint-for-solid-color-background-attachment-fixed-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/no-repaint-for-solid-color-background-attachment-fixed-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/no-repaint-for-solid-color-background-attachment-fixed-expected.txt
new file mode 100644
index 0000000..0a15080c
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/no-repaint-for-solid-color-background-attachment-fixed-expected.txt
@@ -0,0 +1,23 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 7524],
+      "contentsOpaque": true,
+      "backgroundColor": "#0000FF",
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -1500, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/viewport-gradient-background-html-move-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/viewport-gradient-background-html-move-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/viewport-gradient-background-html-move-overflow-expected.txt
new file mode 100644
index 0000000..d5c7d6a
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/viewport-gradient-background-html-move-overflow-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 1200, 900]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/viewport-gradient-background-html-resize-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/viewport-gradient-background-html-resize-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/viewport-gradient-background-html-resize-expected.txt
new file mode 100644
index 0000000..d5c7d6a
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/viewport-gradient-background-html-resize-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 1200, 900]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/viewport-gradient-background-html-resize-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/viewport-gradient-background-html-resize-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/viewport-gradient-background-html-resize-overflow-expected.txt
new file mode 100644
index 0000000..d5c7d6a
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/background/viewport-gradient-background-html-resize-overflow-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 1200, 900]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/block-layout-inline-children-replaced-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/block-layout-inline-children-replaced-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/block-layout-inline-children-replaced-expected.txt
new file mode 100644
index 0000000..ea00f1f1
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/block-layout-inline-children-replaced-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [226, 175, 151, 151]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/block-no-inflow-children-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/block-no-inflow-children-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/block-no-inflow-children-expected.txt
new file mode 100644
index 0000000..8571105
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/block-no-inflow-children-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 98, 26]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/block-shift-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/block-shift-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/block-shift-repaint-expected.txt
index 062835c..b97254c 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/block-shift-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/block-shift-repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/border-current-color-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/border-current-color-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/border-current-color-expected.txt
new file mode 100644
index 0000000..db39637
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/border-current-color-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [87, 330, 180, 180]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/border-image-outset-add-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/border-image-outset-add-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/border-image-outset-add-repaint-expected.txt
new file mode 100644
index 0000000..1a0d8e8
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/border-image-outset-add-repaint-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 113, 113]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/border-image-outset-change-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/border-image-outset-change-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/border-image-outset-change-repaint-expected.txt
new file mode 100644
index 0000000..1a0d8e8
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/border-image-outset-change-repaint-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 113, 113]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/border-radius-repaint-2-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/border-radius-repaint-2-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/border-radius-repaint-2-expected.txt
new file mode 100644
index 0000000..311d05c
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/border-radius-repaint-2-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1310, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#3F3F3F",
+      "invalidations": [
+        [12, 12, 1298, 888]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/border-radius-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/border-radius-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/border-radius-repaint-expected.txt
new file mode 100644
index 0000000..056d224
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/border-radius-repaint-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [28, 358, 301, 133],
+        [28, 118, 301, 133]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/border-radius-without-border-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/border-radius-without-border-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/border-radius-without-border-expected.txt
new file mode 100644
index 0000000..b633e35
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/border-radius-without-border-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 300, 150],
+        [0, 300, 150, 300]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/border-repaint-glitch-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/border-repaint-glitch-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/border-repaint-glitch-expected.txt
new file mode 100644
index 0000000..c65b8df5
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/border-repaint-glitch-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [28, 505, 301, 133],
+        [28, 265, 301, 133]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/box-inline-resize-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/box-inline-resize-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/box-inline-resize-expected.txt
new file mode 100644
index 0000000..46b8e22
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/box-inline-resize-expected.txt
@@ -0,0 +1,16 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [60, 157, 169, 40],
+        [12, 157, 169, 40],
+        [12, 126, 48, 48]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/box-shadow-add-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/box-shadow-add-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/box-shadow-add-repaint-expected.txt
new file mode 100644
index 0000000..cb90cbc
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/box-shadow-add-repaint-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [6, 6, 177, 177]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/box-shadow-change-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/box-shadow-change-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/box-shadow-change-repaint-expected.txt
new file mode 100644
index 0000000..4e06941
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/box-shadow-change-repaint-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [3, 3, 198, 198]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/box-shadow-dynamic-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/box-shadow-dynamic-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/box-shadow-dynamic-expected.txt
new file mode 100644
index 0000000..5ace7406
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/box-shadow-dynamic-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [26, 104, 85, 115],
+        [26, 284, 85, 85]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/box-shadow-inset-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/box-shadow-inset-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/box-shadow-inset-repaint-expected.txt
new file mode 100644
index 0000000..75da119
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/box-shadow-inset-repaint-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 345, 195]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/box-sizing-border-keeping-size-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/box-sizing-border-keeping-size-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/box-sizing-border-keeping-size-expected.txt
new file mode 100644
index 0000000..0fd337f8
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/box-sizing-border-keeping-size-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 300, 150, 150],
+        [0, 0, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/box-sizing-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/box-sizing-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/box-sizing-expected.txt
new file mode 100644
index 0000000..aa2ea0d7
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/box-sizing-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 300, 660, 210],
+        [0, 0, 660, 210]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/box-sizing-padding-keeping-size-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/box-sizing-padding-keeping-size-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/box-sizing-padding-keeping-size-expected.txt
new file mode 100644
index 0000000..0fd337f8
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/box-sizing-padding-keeping-size-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 300, 150, 150],
+        [0, 0, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/hover-pseudo-borders-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/hover-pseudo-borders-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/hover-pseudo-borders-expected.txt
new file mode 100644
index 0000000..c39e9be
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/hover-pseudo-borders-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [207, 12, 150, 150],
+        [12, 12, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/hover-pseudo-borders-whitespace-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/hover-pseudo-borders-whitespace-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/hover-pseudo-borders-whitespace-expected.txt
new file mode 100644
index 0000000..d554165
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/hover-pseudo-borders-whitespace-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 207, 180, 180],
+        [12, 12, 180, 180]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/invalidate-box-shadow-currentColor-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/invalidate-box-shadow-currentColor-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/invalidate-box-shadow-currentColor-expected.txt
new file mode 100644
index 0000000..c2c69a4
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/invalidate-box-shadow-currentColor-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 43, 34]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/margin-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/margin-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/margin-expected.txt
new file mode 100644
index 0000000..a81db41
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/margin-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [30, 30, 150, 150],
+        [0, 0, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/negative-shadow-box-expand-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/negative-shadow-box-expand-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/negative-shadow-box-expand-expected.txt
new file mode 100644
index 0000000..1525aec
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/negative-shadow-box-expand-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [150, 90, 960, 360]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/negative-shadow-box-shrink-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/negative-shadow-box-shrink-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/negative-shadow-box-shrink-expected.txt
new file mode 100644
index 0000000..1525aec
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/negative-shadow-box-shrink-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [150, 90, 960, 360]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/padding-border-keeping-border-box-and-content-box-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/padding-border-keeping-border-box-and-content-box-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/padding-border-keeping-border-box-and-content-box-expected.txt
new file mode 100644
index 0000000..c97619f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/padding-border-keeping-border-box-and-content-box-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 270, 270]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/padding-keeping-content-size-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/padding-keeping-content-size-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/padding-keeping-content-size-expected.txt
new file mode 100644
index 0000000..8ccc46f6
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/padding-keeping-content-size-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 300, 210, 210],
+        [0, 0, 210, 210]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/padding-keeping-visual-size-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/padding-keeping-visual-size-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/padding-keeping-visual-size-expected.txt
new file mode 100644
index 0000000..0fd337f8
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/padding-keeping-visual-size-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 300, 150, 150],
+        [0, 0, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/resize-with-border-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/resize-with-border-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/resize-with-border-expected.txt
new file mode 100644
index 0000000..d8782f5
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/resize-with-border-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [150, 150, 630, 330]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/shadow-box-resize-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/shadow-box-resize-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/shadow-box-resize-expected.txt
new file mode 100644
index 0000000..f11c982
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/shadow-box-resize-expected.txt
@@ -0,0 +1,17 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [150, 150, 285, 180],
+        [150, 450, 210, 255],
+        [450, 450, 210, 180],
+        [450, 150, 210, 180]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/shadow-box-resize-writing-mode-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/shadow-box-resize-writing-mode-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/shadow-box-resize-writing-mode-expected.txt
new file mode 100644
index 0000000..f11c982
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/box/shadow-box-resize-writing-mode-expected.txt
@@ -0,0 +1,17 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [150, 150, 285, 180],
+        [150, 450, 210, 255],
+        [450, 450, 210, 180],
+        [450, 150, 210, 180]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/bugzilla-3509-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/bugzilla-3509-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/bugzilla-3509-expected.txt
index 80cc943..6eb8dc7 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/bugzilla-3509-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/bugzilla-3509-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/bugzilla-5699-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/bugzilla-5699-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/bugzilla-5699-expected.txt
new file mode 100644
index 0000000..1022043
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/bugzilla-5699-expected.txt
@@ -0,0 +1,17 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 267, 54, 26],
+        [12, 222, 54, 26],
+        [12, 218, 6, 26],
+        [12, 195, 6, 26]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/bugzilla-6278-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/bugzilla-6278-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/bugzilla-6278-expected.txt
new file mode 100644
index 0000000..5959936
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/bugzilla-6278-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [15, 198, 438, 299],
+        [15, 198, 363, 353]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/bugzilla-6388-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/bugzilla-6388-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/bugzilla-6388-expected.txt
new file mode 100644
index 0000000..f5b8135
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/bugzilla-6388-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 195, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/bugzilla-6473-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/bugzilla-6473-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/bugzilla-6473-expected.txt
new file mode 100644
index 0000000..3ed582d
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/bugzilla-6473-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 219, 1176, 27],
+        [12, 195, 1176, 27]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/bugzilla-7235-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/bugzilla-7235-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/bugzilla-7235-expected.txt
new file mode 100644
index 0000000..409585f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/bugzilla-7235-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 249, 150, 150],
+        [12, 222, 6, 26]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/button-inner-no-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/button-inner-no-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/button-inner-no-repaint-expected.txt
new file mode 100644
index 0000000..36ece76f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/button-inner-no-repaint-expected.txt
@@ -0,0 +1,11 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/button-spurious-layout-hint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/button-spurious-layout-hint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/button-spurious-layout-hint-expected.txt
new file mode 100644
index 0000000..72edcfd
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/button-spurious-layout-hint-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/canvas-putImageData-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/canvas-putImageData-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/canvas-putImageData-expected.txt
new file mode 100644
index 0000000..72edcfd
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/canvas-putImageData-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/canvas-resize-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/canvas-resize-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/canvas-resize-expected.txt
new file mode 100644
index 0000000..9072f50
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/canvas-resize-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [75, 75, 750, 750],
+        [825, 75, 150, 750]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/canvas-resize-no-full-invalidation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/canvas-resize-no-full-invalidation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/canvas-resize-no-full-invalidation-expected.txt
new file mode 100644
index 0000000..31abe2c8
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/canvas-resize-no-full-invalidation-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#003300",
+      "invalidations": [
+        [825, 75, 150, 750]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/caret-outside-block-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/caret-outside-block-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/caret-outside-block-expected.txt
index d894005..ffc091f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/caret-outside-block-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/caret-outside-block-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/caret-subpixel-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/caret-subpixel-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/caret-subpixel-expected.png
new file mode 100644
index 0000000..efaebee2
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/caret-subpixel-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/caret-subpixel-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/caret-subpixel-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/caret-subpixel-expected.txt
new file mode 100644
index 0000000..65020c8
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/caret-subpixel-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 339, 32]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/change-clip-composited-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/change-clip-composited-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/change-clip-composited-layer-expected.txt
new file mode 100644
index 0000000..3372afd
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/change-clip-composited-layer-expected.txt
@@ -0,0 +1,32 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='target'",
+      "bounds": [150, 15],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "invalidations": [
+        [0, 0, 75, 15]
+      ],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/caret-ancestor-clip-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/caret-ancestor-clip-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/caret-ancestor-clip-change-expected.txt
new file mode 100644
index 0000000..4210c328
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/caret-ancestor-clip-change-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 87, 165, 95]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/clip-path-constant-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/clip-path-constant-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/clip-path-constant-repaint-expected.txt
new file mode 100644
index 0000000..831b36ab
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/clip-path-constant-repaint-expected.txt
@@ -0,0 +1,44 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='clip'",
+      "bounds": [1200, 450],
+      "contentsOpaqueForText": true,
+      "backgroundColor": "#FF0000E6",
+      "transform": 2
+    },
+    {
+      "name": "Synthesized Clip",
+      "bounds": [1200, 450],
+      "transform": 2
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, 150, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/clip-path-in-mask-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/clip-path-in-mask-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/clip-path-in-mask-layer-expected.txt
new file mode 100644
index 0000000..6ebd91f2
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/clip-path-in-mask-layer-expected.txt
@@ -0,0 +1,37 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV",
+      "bounds": [300, 300],
+      "contentsOpaque": true,
+      "backgroundColor": "#0000FF",
+      "invalidations": [
+        [0, 0, 300, 300]
+      ],
+      "transform": 1
+    },
+    {
+      "name": "Synthesized Clip",
+      "bounds": [300, 300],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/clip-path-resize-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/clip-path-resize-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/clip-path-resize-expected.txt
new file mode 100644
index 0000000..7822c75
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/clip-path-resize-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 300, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/clip-unclip-and-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/clip-unclip-and-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/clip-unclip-and-change-expected.txt
new file mode 100644
index 0000000..a54b8402
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/clip-unclip-and-change-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 180, 150, 450]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/clip-with-layout-delta-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/clip-with-layout-delta-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/clip-with-layout-delta-expected.txt
new file mode 100644
index 0000000..4cae0a6
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/clip-with-layout-delta-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [162, 12, 150, 150],
+        [12, 12, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/clipped-relative-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/clipped-relative-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/clipped-relative-expected.txt
new file mode 100644
index 0000000..c00baf4
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/clipped-relative-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 105, 306, 348]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/control-clip-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/control-clip-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/control-clip-expected.txt
new file mode 100644
index 0000000..530c41c
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/control-clip-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 114, 300, 45],
+        [115, 170, 94, 22]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/css-clip-change-stacking-child-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/css-clip-change-stacking-child-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/css-clip-change-stacking-child-expected.txt
new file mode 100644
index 0000000..93294c0
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/css-clip-change-stacking-child-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#ADD8E6",
+      "invalidations": [
+        [12, 312, 450, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/intermediate-layout-position-clip-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/intermediate-layout-position-clip-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/intermediate-layout-position-clip-expected.txt
new file mode 100644
index 0000000..1ce87a3
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/intermediate-layout-position-clip-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 60, 30]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/mask-clip-change-stacking-child-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/mask-clip-change-stacking-child-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/mask-clip-change-stacking-child-expected.txt
new file mode 100644
index 0000000..6374d75e
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/mask-clip-change-stacking-child-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#ADD8E6",
+      "invalidations": [
+        [12, 12, 450, 450]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/outline-clip-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/outline-clip-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/outline-clip-change-expected.txt
new file mode 100644
index 0000000..3cf862a
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/outline-clip-change-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [72, 126, 138, 34]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/replaced-clipped-positioned-not-wrong-incremental-repainting-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/replaced-clipped-positioned-not-wrong-incremental-repainting-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/replaced-clipped-positioned-not-wrong-incremental-repainting-expected.txt
new file mode 100644
index 0000000..ec94181
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/replaced-clipped-positioned-not-wrong-incremental-repainting-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 291, 348]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/resize-with-border-clipped-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/resize-with-border-clipped-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/resize-with-border-clipped-expected.txt
new file mode 100644
index 0000000..0a14ea2
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/resize-with-border-clipped-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [150, 150, 300, 300]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/subtree-root-clip-2-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/subtree-root-clip-2-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/subtree-root-clip-2-expected.txt
new file mode 100644
index 0000000..72edcfd
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/subtree-root-clip-2-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/subtree-root-clip-3-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/subtree-root-clip-3-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/subtree-root-clip-3-expected.txt
index 055c42e..fb427f0 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/subtree-root-clip-3-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/subtree-root-clip-3-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/subtree-root-clip-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/subtree-root-clip-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/subtree-root-clip-expected.txt
new file mode 100644
index 0000000..72edcfd
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/clip/subtree-root-clip-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/background-attachment-local-composited-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/background-attachment-local-composited-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/background-attachment-local-composited-expected.txt
new file mode 100644
index 0000000..3f67e78
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/background-attachment-local-composited-expected.txt
@@ -0,0 +1,55 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='container'",
+      "bounds": [600, 600],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='container'",
+      "bounds": [600, 600],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='container'",
+      "bounds": [600, 3000],
+      "contentsOpaque": true,
+      "backgroundColor": "#0000FF",
+      "invalidations": [
+        [0, 750, 600, 2250]
+      ],
+      "transform": 2
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -2400, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/background-attachment-local-equivalent-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/background-attachment-local-equivalent-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/background-attachment-local-equivalent-expected.txt
new file mode 100644
index 0000000..0b05fb8
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/background-attachment-local-equivalent-expected.txt
@@ -0,0 +1,48 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='container'",
+      "bounds": [600, 600],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='container'",
+      "bounds": [600, 3000],
+      "contentsOpaque": true,
+      "backgroundColor": "#0000FF",
+      "invalidations": [
+        [0, 750, 600, 2250]
+      ],
+      "transform": 2
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -2400, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/child-of-sub-pixel-offset-composited-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/child-of-sub-pixel-offset-composited-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/child-of-sub-pixel-offset-composited-layer-expected.txt
new file mode 100644
index 0000000..d903bd77
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/child-of-sub-pixel-offset-composited-layer-expected.txt
@@ -0,0 +1,32 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='target' class='green'",
+      "position": [-1, 0],
+      "bounds": [22, 21],
+      "contentsOpaqueForText": true,
+      "invalidations": [
+        [0, 0, 22, 21]
+      ],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [151, 150, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/chunk-reorder-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/chunk-reorder-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/chunk-reorder-expected.txt
new file mode 100644
index 0000000..941b611
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/chunk-reorder-expected.txt
@@ -0,0 +1,41 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV",
+      "bounds": [1176, 2],
+      "contentsOpaqueForText": true,
+      "invalidations": [
+        [0, 0, 2, 2]
+      ],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='chunk5'",
+      "position": [600, 600],
+      "bounds": [225, 225],
+      "contentsOpaqueForText": true,
+      "invalidations": [
+        [0, 0, 225, 225]
+      ],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/clipping-should-not-repaint-composited-descendants-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/clipping-should-not-repaint-composited-descendants-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/clipping-should-not-repaint-composited-descendants-expected.txt
new file mode 100644
index 0000000..b6211f8
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/clipping-should-not-repaint-composited-descendants-expected.txt
@@ -0,0 +1,66 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 924],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='clipping-container'",
+      "position": [150, 150],
+      "bounds": [150, 150],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV class='clipped-composited-child'",
+      "bounds": [378, 378],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFF00",
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='clipping-container with-initial-clipping'",
+      "position": [150, 150],
+      "bounds": [150, 150],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV class='clipped-composited-child'",
+      "bounds": [378, 378],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFF00",
+      "transform": 2
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 462, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/column-span-under-composited-column-child-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/column-span-under-composited-column-child-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/column-span-under-composited-column-child-expected.txt
new file mode 100644
index 0000000..72edcfd
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/column-span-under-composited-column-child-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/composited-float-under-composited-inline-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/composited-float-under-composited-inline-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/composited-float-under-composited-inline-expected.txt
new file mode 100644
index 0000000..821c47d
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/composited-float-under-composited-inline-expected.txt
@@ -0,0 +1,32 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) (floating) DIV id='float'",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "invalidations": [
+        [0, 0, 150, 150]
+      ],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [237, 237, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/composited-float-under-composited-inline-individual-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/composited-float-under-composited-inline-individual-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/composited-float-under-composited-inline-individual-expected.txt
new file mode 100644
index 0000000..821c47d
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/composited-float-under-composited-inline-individual-expected.txt
@@ -0,0 +1,32 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) (floating) DIV id='float'",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "invalidations": [
+        [0, 0, 150, 150]
+      ],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [237, 237, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/composited-layer-move-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/composited-layer-move-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/composited-layer-move-expected.txt
new file mode 100644
index 0000000..4e64da3
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/composited-layer-move-expected.txt
@@ -0,0 +1,29 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV id='target'",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [312, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/compositing-reason-removed-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/compositing-reason-removed-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/compositing-reason-removed-expected.txt
new file mode 100644
index 0000000..51e41a97
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/compositing-reason-removed-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 45, 45]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/containing-block-added-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/containing-block-added-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/containing-block-added-expected.txt
new file mode 100644
index 0000000..6741223
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/containing-block-added-expected.txt
@@ -0,0 +1,33 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='container'",
+      "bounds": [188, 188],
+      "contentsOpaqueForText": true,
+      "backgroundColor": "#0000FF",
+      "invalidations": [
+        [0, 0, 150, 150],
+        [75, 75, 113, 113]
+      ],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [300, 150, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/containing-block-added-individual-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/containing-block-added-individual-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/containing-block-added-individual-expected.txt
new file mode 100644
index 0000000..6741223
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/containing-block-added-individual-expected.txt
@@ -0,0 +1,33 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='container'",
+      "bounds": [188, 188],
+      "contentsOpaqueForText": true,
+      "backgroundColor": "#0000FF",
+      "invalidations": [
+        [0, 0, 150, 150],
+        [75, 75, 113, 113]
+      ],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [300, 150, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/containing-block-removed-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/containing-block-removed-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/containing-block-removed-expected.txt
new file mode 100644
index 0000000..a5592235
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/containing-block-removed-expected.txt
@@ -0,0 +1,43 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='container'",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#0000FF",
+      "invalidations": [
+        [0, 0, 150, 150],
+        [75, 75, 113, 113]
+      ],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='fixed'",
+      "position": [75, 75],
+      "bounds": [113, 113],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "invalidations": [
+        [0, 0, 113, 113]
+      ]
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [300, 150, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/containing-block-removed-individual-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/containing-block-removed-individual-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/containing-block-removed-individual-expected.txt
new file mode 100644
index 0000000..d09bda3
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/containing-block-removed-individual-expected.txt
@@ -0,0 +1,44 @@
+CONSOLE MESSAGE: debug
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='container'",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#0000FF",
+      "invalidations": [
+        [0, 0, 150, 150],
+        [75, 75, 113, 113]
+      ],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='fixed'",
+      "position": [75, 75],
+      "bounds": [113, 113],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "invalidations": [
+        [0, 0, 113, 113]
+      ]
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [300, 150, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/dont-invalidate-root-layer-when-composited-layer-becomes-visible-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/dont-invalidate-root-layer-when-composited-layer-becomes-visible-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/dont-invalidate-root-layer-when-composited-layer-becomes-visible-expected.txt
new file mode 100644
index 0000000..fae92c0
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/dont-invalidate-root-layer-when-composited-layer-becomes-visible-expected.txt
@@ -0,0 +1,32 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='target'",
+      "bounds": [300, 300],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "invalidations": [
+        [0, 0, 300, 300]
+      ],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [300, 300, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/fixed-pos-inside-composited-intermediate-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/fixed-pos-inside-composited-intermediate-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/fixed-pos-inside-composited-intermediate-layer-expected.txt
new file mode 100644
index 0000000..c527d8d
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/fixed-pos-inside-composited-intermediate-layer-expected.txt
@@ -0,0 +1,69 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 45030],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV class='compositedBehind'",
+      "bounds": [750, 750],
+      "contentsOpaque": true,
+      "backgroundColor": "#00FFFF",
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='containerOverlapsComposited'",
+      "position": [30, 30],
+      "bounds": [150, 45000],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='fixed'",
+      "bounds": [75, 75],
+      "contentsOpaque": true,
+      "backgroundColor": "#00FF00",
+      "transform": 3
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -150, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    },
+    {
+      "id": 3,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [68, 68, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/fixed-pos-with-abs-pos-child-scroll-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/fixed-pos-with-abs-pos-child-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/fixed-pos-with-abs-pos-child-scroll-expected.txt
new file mode 100644
index 0000000..9a99ebfd
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/fixed-pos-with-abs-pos-child-scroll-expected.txt
@@ -0,0 +1,36 @@
+Hi!
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 6032],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='abs'",
+      "position": [-540, -135],
+      "bounds": [540, 135],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFF00",
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [1178, 855, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/fixed-scroll-in-empty-root-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/fixed-scroll-in-empty-root-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/fixed-scroll-in-empty-root-layer-expected.txt
new file mode 100644
index 0000000..739bfd91
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/fixed-scroll-in-empty-root-layer-expected.txt
@@ -0,0 +1,68 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 3024],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backfaceVisibility": "hidden",
+      "backgroundColor": "#FF0000",
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow HTML",
+      "position": [12, 12],
+      "bounds": [1154, 3000],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "transform": 3
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -300, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, 375, 0, 1]
+      ]
+    },
+    {
+      "id": 3,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, 75, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/float-under-composited-inline-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/float-under-composited-inline-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/float-under-composited-inline-expected.txt
new file mode 100644
index 0000000..6da14899
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/float-under-composited-inline-expected.txt
@@ -0,0 +1,21 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutInline (relative positioned) SPAN",
+      "position": [162, 162],
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "invalidations": [
+        [0, 0, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/iframe-inside-squashed-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/iframe-inside-squashed-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/iframe-inside-squashed-layer-expected.txt
new file mode 100644
index 0000000..9add1cd
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/iframe-inside-squashed-layer-expected.txt
@@ -0,0 +1,74 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 1524],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='foo'",
+      "bounds": [300, 1500],
+      "contentsOpaque": true,
+      "backgroundColor": "#D3D3D3",
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV",
+      "position": [12, 0],
+      "bounds": [150, 750],
+      "contentsOpaqueForText": true,
+      "drawsContent": false
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV",
+      "position": [12, 750],
+      "bounds": [450, 231],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "invalidations": [
+        [12, 12, 46, 26]
+      ]
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [428, 0],
+      "bounds": [22, 225],
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow HTML",
+      "bounds": [428, 324],
+      "invalidations": [
+        [0, 0, 428, 324]
+      ],
+      "transform": 2
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 750, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/invalidate-paint-in-iframe-in-composited-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/invalidate-paint-in-iframe-in-composited-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/invalidate-paint-in-iframe-in-composited-layer-expected.txt
new file mode 100644
index 0000000..7214307
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/invalidate-paint-in-iframe-in-composited-layer-expected.txt
@@ -0,0 +1,36 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 924],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV",
+      "bounds": [456, 300],
+      "contentsOpaqueForText": true,
+      "invalidations": [
+        [15, 15, 75, 75]
+      ],
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 612, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/invalidate-when-leaving-squashed-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/invalidate-when-leaving-squashed-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/invalidate-when-leaving-squashed-layer-expected.txt
new file mode 100644
index 0000000..814746a
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/invalidate-when-leaving-squashed-layer-expected.txt
@@ -0,0 +1,58 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV",
+      "bounds": [300, 300],
+      "contentsOpaque": true,
+      "backgroundColor": "#D3D3D3",
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV",
+      "position": [75, 75],
+      "bounds": [300, 300],
+      "contentsOpaque": true,
+      "backgroundColor": "#ADD8E6",
+      "invalidations": [
+        [0, 0, 300, 300]
+      ]
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='target'",
+      "bounds": [300, 300],
+      "contentsOpaque": true,
+      "backgroundColor": "#ADD8E6",
+      "invalidations": [
+        [0, 0, 300, 300]
+      ],
+      "transform": 2
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [75, 75, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/invalidation-for-subpixel-offset-of-squashed-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/invalidation-for-subpixel-offset-of-squashed-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/invalidation-for-subpixel-offset-of-squashed-layer-expected.txt
index 6acb50e..7b07bc3 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/invalidation-for-subpixel-offset-of-squashed-layer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/invalidation-for-subpixel-offset-of-squashed-layer-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -14,14 +14,14 @@
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV)",
-      "position": [63, 63],
+      "name": "LayoutNGBlockFlow (positioned) DIV",
+      "position": [75, 75],
       "bounds": [376, 376],
+      "contentsOpaqueForText": true,
       "backgroundColor": "#FF0000",
       "invalidations": [
         [76, 76, 300, 300]
-      ],
-      "transform": 1
+      ]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/invalidations-on-composited-layers-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/invalidations-on-composited-layers-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/invalidations-on-composited-layers-expected.txt
new file mode 100644
index 0000000..b1b8d4a8
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/invalidations-on-composited-layers-expected.txt
@@ -0,0 +1,52 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='parent'",
+      "bounds": [600, 600],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "invalidations": [
+        [0, 0, 600, 600]
+      ],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV id='child'",
+      "bounds": [113, 113],
+      "contentsOpaque": true,
+      "backgroundColor": "#0000FF",
+      "invalidations": [
+        [0, 0, 113, 113]
+      ],
+      "transform": 2
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [75, 75, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/invalidations-with-large-negative-margin-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/invalidations-with-large-negative-margin-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/invalidations-with-large-negative-margin-expected.txt
new file mode 100644
index 0000000..1fd76cd
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/invalidations-with-large-negative-margin-expected.txt
@@ -0,0 +1,51 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV",
+      "bounds": [878, 278],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 278],
+      "bounds": [900, 22],
+      "contentsOpaqueForText": true,
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [878, 0],
+      "bounds": [22, 278],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV",
+      "bounds": [878, 600],
+      "contentsOpaqueForText": true,
+      "invalidations": [
+        [600, 0, 75, 75],
+        [0, 0, 75, 75]
+      ],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/new-stacking-context-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/new-stacking-context-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/new-stacking-context-expected.txt
new file mode 100644
index 0000000..c9b3a99
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/new-stacking-context-expected.txt
@@ -0,0 +1,38 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV",
+      "bounds": [150, 150],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='target'",
+      "bounds": [300, 300],
+      "contentsOpaqueForText": true,
+      "backgroundColor": "#00800080",
+      "invalidations": [
+        [0, 0, 300, 300]
+      ],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/opacity-from-zero-to-non-zero-composited-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/opacity-from-zero-to-non-zero-composited-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/opacity-from-zero-to-non-zero-composited-expected.txt
new file mode 100644
index 0000000..a14cf36
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/opacity-from-zero-to-non-zero-composited-expected.txt
@@ -0,0 +1,29 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='target'",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/overlap-test-with-filter-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/overlap-test-with-filter-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/overlap-test-with-filter-expected.txt
new file mode 100644
index 0000000..220ff73
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/overlap-test-with-filter-expected.txt
@@ -0,0 +1,41 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutView #document",
+      "bounds": [450, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFF00"
+    },
+    {
+      "name": "LayoutNGBlockFlow BODY",
+      "bounds": [426, 126],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV",
+      "position": [226.5, 0],
+      "bounds": [450, 150],
+      "contentsOpaqueForText": true
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/pointer-events-composited-scrolling-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/pointer-events-composited-scrolling-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/pointer-events-composited-scrolling-expected.txt
new file mode 100644
index 0000000..fd1072e
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/pointer-events-composited-scrolling-expected.txt
@@ -0,0 +1,31 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='target'",
+      "bounds": [150, 150],
+      "contentsOpaqueForText": true,
+      "invalidations": [
+        [0, 45, 75, 75]
+      ],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/remove-squashed-layer-plus-move-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/remove-squashed-layer-plus-move-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/remove-squashed-layer-plus-move-expected.txt
new file mode 100644
index 0000000..5ef92a2
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/remove-squashed-layer-plus-move-expected.txt
@@ -0,0 +1,62 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [2127, 1512],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV",
+      "bounds": [1500, 1500],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='mv-tile'",
+      "position": [12, 12],
+      "bounds": [150, 75],
+      "contentsOpaque": true,
+      "backgroundColor": "#ADD8E6",
+      "invalidations": [
+        [0, 0, 150, 75]
+      ]
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='mv-tile'",
+      "position": [12, 93],
+      "bounds": [1500, 75],
+      "contentsOpaqueForText": true,
+      "drawsContent": false
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 878],
+      "bounds": [1178, 22]
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 878]
+    },
+    {
+      "name": "Scroll corner of LayoutView #document",
+      "position": [1178, 878],
+      "bounds": [22, 22],
+      "contentsOpaque": true
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/repaint-overflow-scrolled-squashed-content-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/repaint-overflow-scrolled-squashed-content-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/repaint-overflow-scrolled-squashed-content-expected.txt
new file mode 100644
index 0000000..26def86
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/repaint-overflow-scrolled-squashed-content-expected.txt
@@ -0,0 +1,58 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV",
+      "bounds": [278, 278],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 278],
+      "bounds": [300, 22],
+      "contentsOpaqueForText": true,
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [278, 0],
+      "bounds": [22, 278],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='foo2'",
+      "bounds": [225, 1500],
+      "contentsOpaque": true,
+      "backgroundColor": "#ADD8E6",
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='foo'",
+      "bounds": [150, 1500],
+      "contentsOpaque": true,
+      "backgroundColor": "#FF0000",
+      "invalidations": [
+        [0, 0, 150, 1500]
+      ],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/repaint-via-layout-offset-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/repaint-via-layout-offset-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/repaint-via-layout-offset-expected.txt
new file mode 100644
index 0000000..2b2a8ca
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/repaint-via-layout-offset-expected.txt
@@ -0,0 +1,39 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV",
+      "bounds": [300, 300],
+      "contentsOpaque": true,
+      "backgroundColor": "#ADD8E6",
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) SPAN class='child'",
+      "position": [75, 75],
+      "bounds": [75, 75],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "invalidations": [
+        [0, 0, 75, 75]
+      ]
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/requires-backing-repaint-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/requires-backing-repaint-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/requires-backing-repaint-expected.png
new file mode 100644
index 0000000..75367d3
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/requires-backing-repaint-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/resize-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/resize-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/resize-repaint-expected.txt
new file mode 100644
index 0000000..fbd52cc
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/resize-repaint-expected.txt
@@ -0,0 +1,31 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='resizing'",
+      "bounds": [603, 311],
+      "contentsOpaqueForText": true,
+      "invalidations": [
+        [0, 0, 603, 311]
+      ],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/resize-squashing-layer-that-needs-full-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/resize-squashing-layer-that-needs-full-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/resize-squashing-layer-that-needs-full-repaint-expected.txt
index 328bc7b..9bec13bd 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/resize-squashing-layer-that-needs-full-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/resize-squashing-layer-that-needs-full-repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,19 +9,16 @@
     {
       "name": "LayoutNGBlockFlow DIV",
       "bounds": [750, 750],
+      "contentsOpaqueForText": true,
       "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV)",
-      "position": [70, 70],
-      "bounds": [751, 751],
-      "backgroundColor": "#ADD8E6",
-      "invalidations": [
-        [1, 1, 750, 750],
-        [0, 0, 75, 75]
-      ],
-      "transform": 1
+      "name": "LayoutNGBlockFlow (positioned) DIV",
+      "position": [83, 83],
+      "bounds": [750, 750],
+      "contentsOpaque": true,
+      "backgroundColor": "#ADD8E6"
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/scroll-fixed-layer-no-content-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/scroll-fixed-layer-no-content-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/scroll-fixed-layer-no-content-expected.txt
new file mode 100644
index 0000000..112657c
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/scroll-fixed-layer-no-content-expected.txt
@@ -0,0 +1,44 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 3024],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV",
+      "bounds": [300, 300],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 2
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -150, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [150, 150, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/scroll-fixed-layer-out-of-view-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/scroll-fixed-layer-out-of-view-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/scroll-fixed-layer-out-of-view-expected.txt
new file mode 100644
index 0000000..356181c
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/scroll-fixed-layer-out-of-view-expected.txt
@@ -0,0 +1,28 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 3024],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -150, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/scroll-fixed-squahed-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/scroll-fixed-squahed-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/scroll-fixed-squahed-layer-expected.txt
new file mode 100644
index 0000000..6abbc35f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/scroll-fixed-squahed-layer-expected.txt
@@ -0,0 +1,60 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 3024],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='main'",
+      "bounds": [300, 300],
+      "contentsOpaque": true,
+      "backgroundColor": "#ADD8E6",
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='squahed'",
+      "bounds": [300, 300],
+      "contentsOpaque": true,
+      "backgroundColor": "#90EE90",
+      "transform": 3
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -150, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [150, 150, 0, 1]
+      ]
+    },
+    {
+      "id": 3,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [150, 225, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/scrolling-neg-z-index-descendants-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/scrolling-neg-z-index-descendants-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/scrolling-neg-z-index-descendants-expected.txt
new file mode 100644
index 0000000..d437ede
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/scrolling-neg-z-index-descendants-expected.txt
@@ -0,0 +1,61 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV id='neg-z'",
+      "position": [2, 17],
+      "bounds": [150, 615],
+      "backfaceVisibility": "hidden",
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow HTML",
+      "position": [12, 12],
+      "bounds": [1176, 453],
+      "contentsOpaqueForText": true,
+      "drawsContent": false
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV id='container'",
+      "bounds": [153, 453],
+      "contentsOpaqueForText": true,
+      "backfaceVisibility": "hidden",
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV id='container'",
+      "position": [2, 2],
+      "bounds": [150, 450],
+      "drawsContent": false,
+      "backfaceVisibility": "hidden",
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -150, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/scrolling-without-painting-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/scrolling-without-painting-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/scrolling-without-painting-expected.txt
new file mode 100644
index 0000000..f300fd1
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/scrolling-without-painting-expected.txt
@@ -0,0 +1,60 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "position": [2, 2],
+      "bounds": [278, 278],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [1, 279],
+      "bounds": [300, 23],
+      "contentsOpaqueForText": true,
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [280, 1],
+      "bounds": [22, 278],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "position": [2, 39],
+      "bounds": [278, 1500],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 2
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -37.5, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-invoke-deferred-compositing-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-invoke-deferred-compositing-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-invoke-deferred-compositing-expected.txt
new file mode 100644
index 0000000..ecc94777d
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-invoke-deferred-compositing-expected.txt
@@ -0,0 +1,21 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='container' class='composited box'",
+      "bounds": [450, 450],
+      "contentsOpaqueForText": true,
+      "drawsContent": false
+    },
+    {
+      "name": "LayoutHTMLCanvas (positioned) CANVAS",
+      "bounds": [300, 300]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-not-clip-composited-overflow-scrolling-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-not-clip-composited-overflow-scrolling-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-not-clip-composited-overflow-scrolling-layer-expected.txt
new file mode 100644
index 0000000..095633b
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-not-clip-composited-overflow-scrolling-layer-expected.txt
@@ -0,0 +1,67 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='container'",
+      "bounds": [578, 428],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 428],
+      "bounds": [578, 22],
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [578, 0],
+      "bounds": [22, 428],
+      "transform": 1
+    },
+    {
+      "name": "Scroll corner of LayoutNGBlockFlow DIV id='container'",
+      "position": [578, 428],
+      "bounds": [22, 22],
+      "contentsOpaque": true,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='container'",
+      "bounds": [1500, 1500],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "invalidations": [
+        [0, 0, 1500, 1500]
+      ],
+      "transform": 2
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [-750, -600, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-not-clip-composited-viewport-scrolling-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-not-clip-composited-viewport-scrolling-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-not-clip-composited-viewport-scrolling-layer-expected.txt
new file mode 100644
index 0000000..002f45e
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-not-clip-composited-viewport-scrolling-layer-expected.txt
@@ -0,0 +1,42 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [3012, 2274],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "invalidations": [
+        [12, 12, 3000, 2250]
+      ],
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 878],
+      "bounds": [1178, 22]
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 878]
+    },
+    {
+      "name": "Scroll corner of LayoutView #document",
+      "position": [1178, 878],
+      "bounds": [22, 22],
+      "contentsOpaque": true
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [-1350, -1050, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-not-paint-outline-on-foreground-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-not-paint-outline-on-foreground-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-not-paint-outline-on-foreground-layer-expected.txt
new file mode 100644
index 0000000..f04c094
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-not-paint-outline-on-foreground-layer-expected.txt
@@ -0,0 +1,83 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='container'",
+      "bounds": [450, 450],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='container'",
+      "bounds": [428, 428],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 428],
+      "bounds": [428, 22],
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [428, 0],
+      "bounds": [22, 428],
+      "transform": 1
+    },
+    {
+      "name": "Scroll corner of LayoutNGBlockFlow DIV id='container'",
+      "position": [428, 428],
+      "bounds": [22, 22],
+      "contentsOpaque": true,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#FF0000",
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='container'",
+      "bounds": [4500, 4500],
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='container'",
+      "position": [-15, -15],
+      "bounds": [480, 480],
+      "contentsOpaqueForText": true,
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -600, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-not-repaint-composited-descendants-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-not-repaint-composited-descendants-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-not-repaint-composited-descendants-expected.txt
new file mode 100644
index 0000000..b0a826f8
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-not-repaint-composited-descendants-expected.txt
@@ -0,0 +1,50 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='composited-box'",
+      "position": [45, 45],
+      "bounds": [30, 105],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "invalidations": [
+        [0, 0, 30, 105]
+      ],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV class='composited child'",
+      "bounds": [75, 75],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "transform": 2
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, 75, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-not-repaint-composited-descendants-on-overflow-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-not-repaint-composited-descendants-on-overflow-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-not-repaint-composited-descendants-on-overflow-change-expected.txt
new file mode 100644
index 0000000..636b1f5
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-not-repaint-composited-descendants-on-overflow-change-expected.txt
@@ -0,0 +1,67 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV class='composited-child'",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000"
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='composited-child overflow-child'",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV class='composited-child'",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='composited-child overflow-child'",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "transform": 3
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [225, 225, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, 300, 0, 1]
+      ]
+    },
+    {
+      "id": 3,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [225, 525, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-not-repaint-composited-filter-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-not-repaint-composited-filter-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-not-repaint-composited-filter-expected.txt
new file mode 100644
index 0000000..6996553
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-not-repaint-composited-filter-expected.txt
@@ -0,0 +1,29 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='composited-box'",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-not-repaint-composited-opacity-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-not-repaint-composited-opacity-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-not-repaint-composited-opacity-expected.txt
new file mode 100644
index 0000000..6996553
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-not-repaint-composited-opacity-expected.txt
@@ -0,0 +1,29 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='composited-box'",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-not-repaint-composited-transform-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-not-repaint-composited-transform-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-not-repaint-composited-transform-expected.txt
new file mode 100644
index 0000000..68476276
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-not-repaint-composited-transform-expected.txt
@@ -0,0 +1,38 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='composited-box'",
+      "bounds": [153, 153],
+      "contentsOpaqueForText": true,
+      "transform": 2
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [150, 150, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-not-repaint-composited-z-index-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-not-repaint-composited-z-index-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-not-repaint-composited-z-index-expected.txt
new file mode 100644
index 0000000..f758a96
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-not-repaint-composited-z-index-expected.txt
@@ -0,0 +1,30 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='composited-box'",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backfaceVisibility": "hidden",
+      "backgroundColor": "#008000",
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-not-repaint-move-backface-hidden-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-not-repaint-move-backface-hidden-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-not-repaint-move-backface-hidden-expected.txt
new file mode 100644
index 0000000..015abf7b
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-not-repaint-move-backface-hidden-expected.txt
@@ -0,0 +1,30 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='target'",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backfaceVisibility": "hidden",
+      "backgroundColor": "#008000",
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [150, 300, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-not-repaint-scrolling-contents-outline-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-not-repaint-scrolling-contents-outline-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-not-repaint-scrolling-contents-outline-change-expected.txt
new file mode 100644
index 0000000..cac0b97
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/should-not-repaint-scrolling-contents-outline-change-expected.txt
@@ -0,0 +1,65 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='target'",
+      "bounds": [300, 300],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='target'",
+      "bounds": [278, 278],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='target'",
+      "bounds": [278, 3000],
+      "contentsOpaque": true,
+      "backgroundColor": "#0000FF",
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 278],
+      "bounds": [300, 22],
+      "contentsOpaqueForText": true,
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [278, 0],
+      "bounds": [22, 278],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='target'",
+      "position": [-15, -15],
+      "bounds": [330, 330],
+      "contentsOpaqueForText": true,
+      "invalidations": [
+        [0, 0, 330, 330]
+      ],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/squash-partial-repaint-inside-squashed-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/squash-partial-repaint-inside-squashed-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/squash-partial-repaint-inside-squashed-layer-expected.txt
new file mode 100644
index 0000000..7e1e1ab
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/squash-partial-repaint-inside-squashed-layer-expected.txt
@@ -0,0 +1,53 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='composited box behind'",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#0000FF",
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='box middle'",
+      "position": [270, 270],
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#00FF00"
+    },
+    {
+      "name": "LayoutImage (positioned) IMG id='repaintdiv' class='repaintdiv'",
+      "position": [390, 390],
+      "bounds": [273, 44],
+      "contentsOpaque": true,
+      "backgroundColor": "#FA8072",
+      "invalidations": [
+        [0, 0, 273, 44]
+      ]
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='box top'",
+      "position": [510, 420],
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#00FFFF"
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [150, 150, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/squashing-inside-preserve-3d-element-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/squashing-inside-preserve-3d-element-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/squashing-inside-preserve-3d-element-expected.txt
new file mode 100644
index 0000000..c726b823
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/squashing-inside-preserve-3d-element-expected.txt
@@ -0,0 +1,64 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#D3D3D3",
+      "transform": 3
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='target'",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#FF0000",
+      "invalidations": [
+        [0, 0, 150, 150]
+      ],
+      "transform": 4
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "renderingContext": 1
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ],
+      "flattenInheritedTransform": false,
+      "renderingContext": 1
+    },
+    {
+      "id": 3,
+      "parent": 2,
+      "flattenInheritedTransform": false,
+      "renderingContext": 1
+    },
+    {
+      "id": 4,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [42, 42, 0, 1]
+      ],
+      "flattenInheritedTransform": false,
+      "renderingContext": 1
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/stacked-float-under-composited-inline-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/stacked-float-under-composited-inline-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/stacked-float-under-composited-inline-expected.txt
new file mode 100644
index 0000000..7891fd6
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/stacked-float-under-composited-inline-expected.txt
@@ -0,0 +1,21 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) (floating) DIV id='float'",
+      "position": [237, 237],
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "invalidations": [
+        [0, 0, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/text-color-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/text-color-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/text-color-change-expected.txt
new file mode 100644
index 0000000..40e424f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/text-color-change-expected.txt
@@ -0,0 +1,49 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow PRE id='scroller'",
+      "bounds": [278, 278],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 278],
+      "bounds": [300, 22],
+      "contentsOpaqueForText": true,
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [278, 0],
+      "bounds": [22, 278],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow PRE id='scroller'",
+      "bounds": [72, 902],
+      "invalidations": [
+        [0, 0, 72, 902]
+      ],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 86, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/text-match-highlight-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/text-match-highlight-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/text-match-highlight-expected.txt
new file mode 100644
index 0000000..b29ac72
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/text-match-highlight-expected.txt
@@ -0,0 +1,58 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [428, 54, 69, 26]
+      ]
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV",
+      "bounds": [1178, 728],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 728],
+      "bounds": [1200, 22],
+      "contentsOpaqueForText": true,
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 728],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV",
+      "bounds": [1178, 2010],
+      "invalidations": [
+        [15, 108, 345, 27],
+        [32, 243, 266, 105],
+        [15, 192, 207, 18],
+        [410, 0, 69, 26],
+        [341, 0, 69, 26],
+        [137, 0, 69, 26],
+        [80, 27, 69, 26]
+      ],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, 81, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/tricky-element-removal-crash-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/tricky-element-removal-crash-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/tricky-element-removal-crash-expected.txt
new file mode 100644
index 0000000..31b3270
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/tricky-element-removal-crash-expected.txt
@@ -0,0 +1,36 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV",
+      "bounds": [300, 300],
+      "contentsOpaque": true,
+      "backgroundColor": "#FA8072",
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV",
+      "position": [12, 12],
+      "bounds": [150, 150],
+      "contentsOpaqueForText": true,
+      "drawsContent": false
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/updating-scrolling-container-and-content-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/updating-scrolling-container-and-content-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/updating-scrolling-container-and-content-expected.txt
new file mode 100644
index 0000000..8bc1d3c3
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/updating-scrolling-container-and-content-expected.txt
@@ -0,0 +1,71 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='container'",
+      "bounds": [278, 278],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 278],
+      "bounds": [300, 22],
+      "contentsOpaqueForText": true,
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [278, 0],
+      "bounds": [22, 278],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='container'",
+      "bounds": [112, 351],
+      "invalidations": [
+        [0, 324, 112, 26],
+        [0, 297, 112, 26],
+        [0, 270, 112, 26],
+        [0, 243, 112, 26],
+        [0, 216, 112, 26],
+        [0, 189, 112, 26],
+        [0, 162, 112, 26],
+        [0, 135, 112, 26],
+        [0, 108, 112, 26],
+        [0, 81, 112, 26],
+        [0, 54, 112, 26],
+        [0, 27, 112, 26],
+        [0, 0, 112, 26]
+      ],
+      "transform": 2
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 162, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -73, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/updating-scrolling-container-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/updating-scrolling-container-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/updating-scrolling-container-expected.txt
new file mode 100644
index 0000000..889907d
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/updating-scrolling-container-expected.txt
@@ -0,0 +1,57 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 162, 315, 315]
+      ]
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='container'",
+      "position": [8, 8],
+      "bounds": [278, 278],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [7, 286],
+      "bounds": [278, 22],
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [286, 7],
+      "bounds": [22, 278],
+      "transform": 1
+    },
+    {
+      "name": "Scroll corner of LayoutNGBlockFlow DIV id='container'",
+      "position": [285, 285],
+      "bounds": [22, 22],
+      "contentsOpaque": true,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='container'",
+      "position": [8, 8],
+      "bounds": [600, 600],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 162, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/updating-scrolling-content-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/updating-scrolling-content-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/updating-scrolling-content-expected.txt
new file mode 100644
index 0000000..e533d524
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/compositing/updating-scrolling-content-expected.txt
@@ -0,0 +1,50 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "bounds": [278, 278],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 278],
+      "bounds": [300, 22],
+      "contentsOpaqueForText": true,
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [278, 0],
+      "bounds": [22, 278],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "bounds": [278, 1800],
+      "contentsOpaqueForText": true,
+      "invalidations": [
+        [0, 0, 278, 300]
+      ],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/crbug-371640-2-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/crbug-371640-2-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/crbug-371640-2-expected.txt
new file mode 100644
index 0000000..807ed787
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/crbug-371640-2-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [522, 126, 150, 150],
+        [132, 126, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/crbug-371640-3-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/crbug-371640-3-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/crbug-371640-3-expected.txt
new file mode 100644
index 0000000..128bab0
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/crbug-371640-3-expected.txt
@@ -0,0 +1,16 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [762, 306, 150, 150],
+        [762, 126, 150, 150],
+        [612, 306, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/crbug-371640-4-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/crbug-371640-4-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/crbug-371640-4-expected.txt
new file mode 100644
index 0000000..7220fa72
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/crbug-371640-4-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [612, 126, 150, 150],
+        [312, 126, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/crbug-371640-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/crbug-371640-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/crbug-371640-expected.txt
new file mode 100644
index 0000000..807ed787
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/crbug-371640-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [522, 126, 150, 150],
+        [132, 126, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/create-layer-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/create-layer-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/create-layer-repaint-expected.txt
new file mode 100644
index 0000000..cf0a731
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/create-layer-repaint-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [42, 81, 750, 75]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/css-grid-layout/align-items-change-from-baseline-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/css-grid-layout/align-items-change-from-baseline-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/css-grid-layout/align-items-change-from-baseline-expected.txt
index 5e75a59..39a8a34 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/css-grid-layout/align-items-change-from-baseline-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/css-grid-layout/align-items-change-from-baseline-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/css-grid-layout/align-items-change-to-baseline-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/css-grid-layout/align-items-change-to-baseline-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/css-grid-layout/align-items-change-to-baseline-expected.txt
index 5e75a59..39a8a34 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/css-grid-layout/align-items-change-to-baseline-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/css-grid-layout/align-items-change-to-baseline-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/css-grid-layout/align-self-change-from-baseline-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/css-grid-layout/align-self-change-from-baseline-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/css-grid-layout/align-self-change-from-baseline-expected.txt
index a7b46fa..989e0a2 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/css-grid-layout/align-self-change-from-baseline-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/css-grid-layout/align-self-change-from-baseline-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/css-grid-layout/align-self-change-to-baseline-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/css-grid-layout/align-self-change-to-baseline-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/css-grid-layout/align-self-change-to-baseline-expected.txt
index a7b46fa..989e0a2 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/css-grid-layout/align-self-change-to-baseline-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/css-grid-layout/align-self-change-to-baseline-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/css-grid-layout/grid-element-change-columns-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/css-grid-layout/grid-element-change-columns-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/css-grid-layout/grid-element-change-columns-repaint-expected.txt
new file mode 100644
index 0000000..3506d950
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/css-grid-layout/grid-element-change-columns-repaint-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 72, 375, 75]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/css-grid-layout/grid-element-change-rows-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/css-grid-layout/grid-element-change-rows-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/css-grid-layout/grid-element-change-rows-repaint-expected.txt
new file mode 100644
index 0000000..f6f7feb
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/css-grid-layout/grid-element-change-rows-repaint-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 72, 150, 225]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/css-grid-layout/grid-item-change-column-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/css-grid-layout/grid-item-change-column-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/css-grid-layout/grid-item-change-column-repaint-expected.txt
new file mode 100644
index 0000000..9da5a75c
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/css-grid-layout/grid-item-change-column-repaint-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 57, 150, 75],
+        [312, 57, 75, 75]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/css-grid-layout/grid-item-change-row-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/css-grid-layout/grid-item-change-row-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/css-grid-layout/grid-item-change-row-repaint-expected.txt
new file mode 100644
index 0000000..d91b456
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/css-grid-layout/grid-item-change-row-repaint-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 132, 150, 150],
+        [12, 57, 150, 75]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/css-grid-layout/grid-item-z-index-change-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/css-grid-layout/grid-item-z-index-change-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/css-grid-layout/grid-item-z-index-change-repaint-expected.txt
new file mode 100644
index 0000000..0d0c71a
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/css-grid-layout/grid-item-z-index-change-repaint-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 24, 704, 480]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/cull-rect-change-crash-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/cull-rect-change-crash-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/cull-rect-change-crash-expected.txt
new file mode 100644
index 0000000..4df11b2
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/cull-rect-change-crash-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 12, 1, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/delete-into-nested-block-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/delete-into-nested-block-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/delete-into-nested-block-expected.png
index 9438b3e..d53c6ce 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/delete-into-nested-block-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/delete-into-nested-block-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/delete-into-nested-block-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/delete-into-nested-block-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/delete-into-nested-block-expected.txt
index 8f893f19..3f56fd7 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/delete-into-nested-block-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/delete-into-nested-block-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/details-open-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/details-open-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/details-open-repaint-expected.txt
index a52ccac..84632ea 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/details-open-repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/details-open-repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/empty-object-move-and-resize-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/empty-object-move-and-resize-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/empty-object-move-and-resize-expected.txt
new file mode 100644
index 0000000..36ece76f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/empty-object-move-and-resize-expected.txt
@@ -0,0 +1,11 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-composite-1-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-composite-1-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-composite-1-expected.txt
new file mode 100644
index 0000000..24dad3c2
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-composite-1-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [192, 180, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-composite-2-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-composite-2-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-composite-2-expected.txt
new file mode 100644
index 0000000..cc32fc4b
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-composite-2-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [192, 180, 300, 300]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-composite-3-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-composite-3-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-composite-3-expected.txt
new file mode 100644
index 0000000..d4d91e3
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-composite-3-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 492, 480]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-composite-4-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-composite-4-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-composite-4-expected.txt
new file mode 100644
index 0000000..cc32fc4b
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-composite-4-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [192, 180, 300, 300]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-composite-5-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-composite-5-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-composite-5-expected.txt
new file mode 100644
index 0000000..24dad3c2
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-composite-5-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [192, 180, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-composite-6-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-composite-6-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-composite-6-expected.txt
new file mode 100644
index 0000000..efcd45d
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-composite-6-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [42, 30, 450, 450]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-displacement-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-displacement-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-displacement-expected.txt
new file mode 100644
index 0000000..b29df63
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-displacement-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 0, 360, 360]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-gaussianblur-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-gaussianblur-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-gaussianblur-expected.txt
new file mode 100644
index 0000000..4ecd870
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-gaussianblur-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 477, 465]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-gaussianblur-xonly-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-gaussianblur-xonly-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-gaussianblur-xonly-expected.txt
new file mode 100644
index 0000000..17c3def
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-gaussianblur-xonly-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 75, 477, 300]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-gaussianblur-yonly-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-gaussianblur-yonly-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-gaussianblur-yonly-expected.txt
new file mode 100644
index 0000000..86cdf6f5
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-gaussianblur-yonly-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [87, 0, 300, 465]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-lighting-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-lighting-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-lighting-expected.txt
new file mode 100644
index 0000000..792fc03
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-lighting-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [117, 105, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-merge-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-merge-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-merge-expected.txt
new file mode 100644
index 0000000..efcd45d
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-merge-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [42, 30, 450, 450]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-morphology-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-morphology-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-morphology-expected.txt
new file mode 100644
index 0000000..9282a25e
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-morphology-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [49, 37, 376, 376]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-morphology-xonly-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-morphology-xonly-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-morphology-xonly-expected.txt
new file mode 100644
index 0000000..6cdf01b
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-morphology-xonly-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [49, 75, 376, 300]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-morphology-yonly-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-morphology-yonly-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-morphology-yonly-expected.txt
new file mode 100644
index 0000000..a820beb
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-morphology-yonly-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [87, 37, 300, 376]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-offset-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-offset-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-offset-expected.txt
new file mode 100644
index 0000000..5dd814b9
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-offset-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [297, 297, 165, 165]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-primitive-attr-mutation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-primitive-attr-mutation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-primitive-attr-mutation-expected.txt
new file mode 100644
index 0000000..72edcfd
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-primitive-attr-mutation-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-primitive-attr-removal-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-primitive-attr-removal-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-primitive-attr-removal-expected.txt
new file mode 100644
index 0000000..72edcfd
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-primitive-attr-removal-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-primitive-removed-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-primitive-removed-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-primitive-removed-expected.txt
new file mode 100644
index 0000000..72edcfd
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/effect-reference-repaint-primitive-removed-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/filter-invalidation-after-display-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/filter-invalidation-after-display-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/filter-invalidation-after-display-expected.txt
new file mode 100644
index 0000000..92c8aa4
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/filter-invalidation-after-display-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [450, 12, 495, 495]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/filter-invalidation-positioned-child-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/filter-invalidation-positioned-child-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/filter-invalidation-positioned-child-expected.txt
new file mode 100644
index 0000000..8a37907
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/filter-invalidation-positioned-child-expected.txt
@@ -0,0 +1,25 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='box'",
+      "position": [12, 12],
+      "bounds": [135, 135],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='positioned'",
+      "position": [162, 162],
+      "bounds": [75, 75],
+      "contentsOpaque": true,
+      "backgroundColor": "#0000FF"
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/filter-invalidation-with-composited-container-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/filter-invalidation-with-composited-container-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/filter-invalidation-with-composited-container-change-expected.txt
new file mode 100644
index 0000000..65452930
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/filter-invalidation-with-composited-container-change-expected.txt
@@ -0,0 +1,35 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 495, 495]
+      ]
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='box' class='green box blurry'",
+      "bounds": [300, 300],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "invalidations": [
+        [0, 0, 300, 300]
+      ],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/filter-on-html-element-with-fixed-position-child-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/filter-on-html-element-with-fixed-position-child-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/filter-on-html-element-with-fixed-position-child-expected.txt
new file mode 100644
index 0000000..3235a457
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/filter-on-html-element-with-fixed-position-child-expected.txt
@@ -0,0 +1,66 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 15024],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "transform": 1
+    },
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 15024],
+      "contentsOpaqueForText": true,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#D3D3D3",
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#D3D3D3",
+      "transform": 3
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -15, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    },
+    {
+      "id": 3,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [150, 150, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/filter-repaint-accelerated-child-with-filter-child-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/filter-repaint-accelerated-child-with-filter-child-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/filter-repaint-accelerated-child-with-filter-child-expected.txt
new file mode 100644
index 0000000..b04992e3
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/filter-repaint-accelerated-child-with-filter-child-expected.txt
@@ -0,0 +1,38 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV class='blur'",
+      "position": [12, 12],
+      "bounds": [300, 300],
+      "contentsOpaqueForText": true
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV class='accelerated'",
+      "position": [-21, -21],
+      "bounds": [321, 390],
+      "contentsOpaqueForText": true,
+      "invalidations": [
+        [0, 0, 321, 390]
+      ],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/filter-repaint-accelerated-on-accelerated-filter-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/filter-repaint-accelerated-on-accelerated-filter-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/filter-repaint-accelerated-on-accelerated-filter-expected.txt
new file mode 100644
index 0000000..3705fece
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/filter-repaint-accelerated-on-accelerated-filter-expected.txt
@@ -0,0 +1,38 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV class='blur accelerated'",
+      "bounds": [300, 300],
+      "contentsOpaqueForText": true,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='resize' class='drop-shadow accelerated'",
+      "bounds": [150, 300],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "invalidations": [
+        [0, 0, 150, 300]
+      ],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/filter-repaint-on-accelerated-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/filter-repaint-on-accelerated-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/filter-repaint-on-accelerated-layer-expected.txt
new file mode 100644
index 0000000..354d167
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/filters/filter-repaint-on-accelerated-layer-expected.txt
@@ -0,0 +1,35 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV class='blur'",
+      "position": [12, 12],
+      "bounds": [300, 300],
+      "contentsOpaqueForText": true
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='resize' class='accelerated'",
+      "bounds": [150, 300],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/align-content-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/align-content-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/align-content-change-expected.txt
new file mode 100644
index 0000000..af38705d
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/align-content-change-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 303, 300, 225],
+        [0, 78, 300, 225]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/align-content-change-keeping-geometry-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/align-content-change-keeping-geometry-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/align-content-change-keeping-geometry-expected.txt
new file mode 100644
index 0000000..36ece76f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/align-content-change-keeping-geometry-expected.txt
@@ -0,0 +1,11 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/align-content-change-no-flex-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/align-content-change-no-flex-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/align-content-change-no-flex-expected.txt
new file mode 100644
index 0000000..36ece76f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/align-content-change-no-flex-expected.txt
@@ -0,0 +1,11 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/align-content-distribution-change-grid-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/align-content-distribution-change-grid-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/align-content-distribution-change-grid-expected.txt
new file mode 100644
index 0000000..e843e146
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/align-content-distribution-change-grid-expected.txt
@@ -0,0 +1,16 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 378, 300, 150],
+        [0, 228, 300, 150],
+        [0, 78, 300, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/align-items-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/align-items-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/align-items-change-expected.txt
new file mode 100644
index 0000000..9cca095
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/align-items-change-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [150, 78, 150, 450],
+        [0, 78, 150, 450]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/align-self-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/align-self-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/align-self-change-expected.txt
new file mode 100644
index 0000000..9cca095
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/align-self-change-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [150, 78, 150, 450],
+        [0, 78, 150, 450]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/align-self-change-grid-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/align-self-change-grid-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/align-self-change-grid-expected.txt
index 611ee8b..a2e422a 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/align-self-change-grid-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/align-self-change-grid-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/align-self-change-keeping-geometry-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/align-self-change-keeping-geometry-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/align-self-change-keeping-geometry-expected.txt
new file mode 100644
index 0000000..36ece76f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/align-self-change-keeping-geometry-expected.txt
@@ -0,0 +1,11 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/align-self-change-keeping-geometry-grid-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/align-self-change-keeping-geometry-grid-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/align-self-change-keeping-geometry-grid-expected.txt
new file mode 100644
index 0000000..36ece76f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/align-self-change-keeping-geometry-grid-expected.txt
@@ -0,0 +1,11 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/align-self-change-no-flex-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/align-self-change-no-flex-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/align-self-change-no-flex-expected.txt
new file mode 100644
index 0000000..36ece76f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/align-self-change-no-flex-expected.txt
@@ -0,0 +1,11 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/justify-content-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/justify-content-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/justify-content-change-expected.txt
new file mode 100644
index 0000000..c1bdd27
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/justify-content-change-expected.txt
@@ -0,0 +1,17 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [222, 78, 78, 450],
+        [186, 78, 78, 450],
+        [36, 78, 78, 450],
+        [0, 78, 78, 450]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/justify-content-distribution-change-grid-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/justify-content-distribution-change-grid-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/justify-content-distribution-change-grid-expected.txt
new file mode 100644
index 0000000..270d454c
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/justify-content-distribution-change-grid-expected.txt
@@ -0,0 +1,16 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [300, 78, 150, 300],
+        [150, 78, 150, 300],
+        [0, 78, 150, 300]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/justify-items-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/justify-items-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/justify-items-change-expected.txt
new file mode 100644
index 0000000..b37f513b
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/justify-items-change-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [225, 78, 75, 450],
+        [0, 78, 75, 450]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/justify-items-legacy-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/justify-items-legacy-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/justify-items-legacy-change-expected.txt
new file mode 100644
index 0000000..961cfabb
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/justify-items-legacy-change-expected.txt
@@ -0,0 +1,17 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [186, 78, 78, 225],
+        [150, 78, 78, 225],
+        [36, 78, 78, 225],
+        [0, 78, 78, 225]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/justify-self-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/justify-self-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/justify-self-change-expected.txt
index ec5ec3ac..c039549 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/justify-self-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/justify-self-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/justify-self-change-keeping-geometry-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/justify-self-change-keeping-geometry-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/justify-self-change-keeping-geometry-expected.txt
new file mode 100644
index 0000000..36ece76f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/justify-self-change-keeping-geometry-expected.txt
@@ -0,0 +1,11 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/remove-inline-block-descendant-of-flex-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/remove-inline-block-descendant-of-flex-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/remove-inline-block-descendant-of-flex-expected.txt
new file mode 100644
index 0000000..85eaef1
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/remove-inline-block-descendant-of-flex-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 300, 150, 150],
+        [0, 150, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/repaint-column-reverse-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/repaint-column-reverse-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/repaint-column-reverse-expected.txt
index 1a04819c..1802ada 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/repaint-column-reverse-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/repaint-column-reverse-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/repaint-during-resize-no-flex-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/repaint-during-resize-no-flex-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/repaint-during-resize-no-flex-expected.txt
new file mode 100644
index 0000000..8cf65b3
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/repaint-during-resize-no-flex-expected.txt
@@ -0,0 +1,18 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [45, 30, 60, 75],
+        [240, 30, 15, 75],
+        [180, 30, 15, 75],
+        [165, 30, 15, 75],
+        [105, 30, 15, 75]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/repaint-expected.txt
index 0a0737a..2f17581 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/repaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/repaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/repaint-on-layout-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/repaint-on-layout-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/repaint-on-layout-expected.txt
new file mode 100644
index 0000000..e82e121
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/repaint-on-layout-expected.txt
@@ -0,0 +1,21 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [1068, 12, 120, 30]
+      ]
+    },
+    {
+      "name": "LayoutNGFlexibleBox (positioned) NAV class='nav-bar'",
+      "position": [12, 0],
+      "bounds": [300, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000"
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/repaint-on-margin-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/repaint-on-margin-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/repaint-on-margin-change-expected.txt
new file mode 100644
index 0000000..d7d4cbf
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/repaint-on-margin-change-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [72, 42, 30, 30],
+        [12, 42, 30, 30]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/repaint-opacity-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/repaint-opacity-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/repaint-opacity-change-expected.txt
new file mode 100644
index 0000000..7f021f9
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/repaint-opacity-change-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [27, 27, 1146, 30]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/repaint-rtl-column-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/repaint-rtl-column-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/repaint-rtl-column-expected.txt
index 443b79d..e5013c2d 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/repaint-rtl-column-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/repaint-rtl-column-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/scrollbars-changed-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/scrollbars-changed-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/scrollbars-changed-expected.txt
new file mode 100644
index 0000000..4b5f809
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/flexbox/scrollbars-changed-expected.txt
@@ -0,0 +1,29 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "bounds": [278, 150],
+      "drawsContent": false
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "bounds": [278, 315],
+      "backgroundColor": "#80808080",
+      "invalidations": [
+        [0, 7, 23, 23]
+      ]
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [278, 0],
+      "bounds": [22, 150]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/float-in-new-block-with-layout-delta-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/float-in-new-block-with-layout-delta-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/float-in-new-block-with-layout-delta-expected.txt
new file mode 100644
index 0000000..36605bc
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/float-in-new-block-with-layout-delta-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 162, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/float-move-during-layout-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/float-move-during-layout-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/float-move-during-layout-expected.txt
new file mode 100644
index 0000000..ac2a4f9
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/float-move-during-layout-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 306, 150, 150],
+        [12, 156, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/float-new-in-block-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/float-new-in-block-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/float-new-in-block-expected.txt
new file mode 100644
index 0000000..72edcfd
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/float-new-in-block-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/float-offscreen-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/float-offscreen-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/float-offscreen-expected.txt
new file mode 100644
index 0000000..f4aa80b
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/float-offscreen-expected.txt
@@ -0,0 +1,34 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='target'",
+      "bounds": [1176, 450],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='target'",
+      "bounds": [150, 1541],
+      "contentsOpaqueForText": true,
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/button-checkbox-click-method-repaint-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/button-checkbox-click-method-repaint-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/button-checkbox-click-method-repaint-expected.png
new file mode 100644
index 0000000..7ba5cf5
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/button-checkbox-click-method-repaint-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/button-checkbox-click-method-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/button-checkbox-click-method-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/button-checkbox-click-method-repaint-expected.txt
new file mode 100644
index 0000000..67b7ae9
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/button-checkbox-click-method-repaint-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [18, 91, 45, 46]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown-expected.png
new file mode 100644
index 0000000..0f104853
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown-expected.txt
new file mode 100644
index 0000000..2792e93
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [9, 9, 82, 38]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/details-marker-color-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/details-marker-color-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/details-marker-color-change-expected.txt
new file mode 100644
index 0000000..4cb5aa57
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/details-marker-color-change-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [34, 12, 70, 26],
+        [12, 12, 16, 26]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/radio-focus-by-mouse-then-keydown-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/radio-focus-by-mouse-then-keydown-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/radio-focus-by-mouse-then-keydown-expected.png
new file mode 100644
index 0000000..e92a80d7
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/radio-focus-by-mouse-then-keydown-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/radio-focus-by-mouse-then-keydown-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/radio-focus-by-mouse-then-keydown-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/radio-focus-by-mouse-then-keydown-expected.txt
new file mode 100644
index 0000000..66593f7c
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/radio-focus-by-mouse-then-keydown-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 9, 34, 34]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/range-focus-by-mouse-then-keydown-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/range-focus-by-mouse-then-keydown-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/range-focus-by-mouse-then-keydown-expected.png
new file mode 100644
index 0000000..ac5432ef
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/range-focus-by-mouse-then-keydown-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/range-focus-by-mouse-then-keydown-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/range-focus-by-mouse-then-keydown-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/range-focus-by-mouse-then-keydown-expected.txt
new file mode 100644
index 0000000..308315b
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/range-focus-by-mouse-then-keydown-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [11, 11, 202, 32]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/select-option-background-color-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/select-option-background-color-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/select-option-background-color-expected.txt
index 0b4647c..f2ff90e5 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/select-option-background-color-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/select-option-background-color-expected.txt
@@ -1,12 +1,11 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "invalidations": [
-        [21, 52, 22, 102],
         [2, 53, 19, 25]
       ]
     }

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.png
new file mode 100644
index 0000000..62eba02
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.txt
new file mode 100644
index 0000000..b763055
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [9, 9, 92, 38]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/textarea-appearance-none-resize-handle-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/textarea-appearance-none-resize-handle-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/textarea-appearance-none-resize-handle-expected.txt
new file mode 100644
index 0000000..ea54059
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/textarea-appearance-none-resize-handle-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 75, 159, 309]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/textarea-caret-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/textarea-caret-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/textarea-caret-expected.png
index 1562fcb1..8bf5af6 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/textarea-caret-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/textarea-caret-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/textarea-caret-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/textarea-caret-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/textarea-caret-expected.txt
new file mode 100644
index 0000000..70f899c
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/textarea-caret-expected.txt
@@ -0,0 +1,79 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [9, 9, 277, 59]
+      ]
+    },
+    {
+      "name": "LayoutNGTextControlMultiLine TEXTAREA id='editor'",
+      "position": [2, 2],
+      "bounds": [268, 28],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "Scroll corner of LayoutNGTextControlMultiLine TEXTAREA id='editor'",
+      "position": [225, 7],
+      "bounds": [44, 44],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "invalidations": [
+        [0, 0, 44, 44]
+      ],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGTextControlMultiLine TEXTAREA id='editor'",
+      "position": [2, 2],
+      "bounds": [723, 28],
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 723, 28]
+      ],
+      "transform": 2
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [1, 30],
+      "bounds": [246, 22],
+      "transform": 1
+    },
+    {
+      "name": "Scroll corner of LayoutNGTextControlMultiLine TEXTAREA id='editor'",
+      "position": [-3, -3],
+      "bounds": [277, 59],
+      "contentsOpaqueForText": true,
+      "invalidations": [
+        [0, 0, 277, 59]
+      ],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [-455, 0, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/textarea-resize-property-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/textarea-resize-property-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/textarea-resize-property-change-expected.txt
new file mode 100644
index 0000000..ee638f2
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/textarea-resize-property-change-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 75, 159, 159]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/textarea-set-disabled-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/textarea-set-disabled-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/textarea-set-disabled-expected.txt
new file mode 100644
index 0000000..f135462
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/forms/textarea-set-disabled-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 159, 159]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/gradients-em-stops-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/gradients-em-stops-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/gradients-em-stops-repaint-expected.txt
new file mode 100644
index 0000000..d413b80
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/gradients-em-stops-repaint-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [516, 27, 453, 183],
+        [495, 204, 6, 26]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/iframe-display-block-to-display-none-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/iframe-display-block-to-display-none-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/iframe-display-block-to-display-none-expected.txt
new file mode 100644
index 0000000..4291c60
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/iframe-display-block-to-display-none-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 102, 1098, 141]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/iframe-display-none-to-display-block-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/iframe-display-none-to-display-block-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/iframe-display-none-to-display-block-expected.txt
new file mode 100644
index 0000000..4291c60
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/iframe-display-none-to-display-block-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 102, 1098, 141]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/iframe-rounding-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/iframe-rounding-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/iframe-rounding-expected.txt
index b6b7433b..5fd83a73 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/iframe-rounding-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/iframe-rounding-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/image/canvas-composite-repaint-by-all-imagesource-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/image/canvas-composite-repaint-by-all-imagesource-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/image/canvas-composite-repaint-by-all-imagesource-expected.txt
new file mode 100644
index 0000000..211d236
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/image/canvas-composite-repaint-by-all-imagesource-expected.txt
@@ -0,0 +1,84 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 1397],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [852, 845, 198, 63],
+        [852, 770, 198, 63],
+        [852, 695, 198, 63],
+        [852, 620, 198, 63],
+        [852, 545, 198, 63],
+        [852, 470, 198, 63],
+        [852, 395, 198, 63],
+        [852, 320, 198, 63],
+        [852, 245, 198, 63],
+        [852, 170, 198, 63],
+        [852, 95, 198, 63],
+        [639, 845, 198, 63],
+        [639, 770, 198, 63],
+        [639, 695, 198, 63],
+        [639, 620, 198, 63],
+        [639, 545, 198, 63],
+        [639, 470, 198, 63],
+        [639, 395, 198, 63],
+        [639, 320, 198, 63],
+        [639, 245, 198, 63],
+        [639, 170, 198, 63],
+        [639, 95, 198, 63],
+        [426, 845, 198, 63],
+        [426, 770, 198, 63],
+        [426, 695, 198, 63],
+        [426, 620, 198, 63],
+        [426, 545, 198, 63],
+        [426, 470, 198, 63],
+        [426, 395, 198, 63],
+        [426, 320, 198, 63],
+        [426, 245, 198, 63],
+        [426, 170, 198, 63],
+        [426, 95, 198, 63],
+        [213, 845, 198, 63],
+        [213, 770, 198, 63],
+        [213, 695, 198, 63],
+        [213, 620, 198, 63],
+        [213, 545, 198, 63],
+        [213, 470, 198, 63],
+        [213, 395, 198, 63],
+        [213, 320, 198, 63],
+        [213, 245, 198, 63],
+        [213, 170, 198, 63],
+        [213, 95, 198, 63]
+      ]
+    },
+    {
+      "name": "LayoutVideo VIDEO id='video'",
+      "bounds": [225, 90],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGFlexibleBox DIV class='sizing-small phase-pre-ready state-no-source'",
+      "bounds": [225, 90],
+      "contentsOpaqueForText": true,
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [23, 1286, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/image/do-not-paint-below-image-baseline-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/image/do-not-paint-below-image-baseline-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/image/do-not-paint-below-image-baseline-expected.txt
new file mode 100644
index 0000000..c229820
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/image/do-not-paint-below-image-baseline-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [75, 75, 389, 291]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/image/image-resize-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/image/image-resize-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/image/image-resize-expected.txt
new file mode 100644
index 0000000..42a2b153
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/image/image-resize-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 75, 225, 225],
+        [0, 75, 150, 300]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/image/percent-size-image-resize-container-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/image/percent-size-image-resize-container-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/image/percent-size-image-resize-container-expected.txt
new file mode 100644
index 0000000..42a2b153
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/image/percent-size-image-resize-container-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 75, 225, 225],
+        [0, 75, 150, 300]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/in-scaled-iframe-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/in-scaled-iframe-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/in-scaled-iframe-expected.txt
new file mode 100644
index 0000000..8bf6f0a
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/in-scaled-iframe-expected.txt
@@ -0,0 +1,19 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 1236],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [313, 313, 151, 151]
+      ]
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/inline-block-resize-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/inline-block-resize-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/inline-block-resize-expected.txt
new file mode 100644
index 0000000..72edcfd
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/inline-block-resize-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/inline-color-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/inline-color-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/inline-color-change-expected.txt
new file mode 100644
index 0000000..a23dc869
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/inline-color-change-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 102, 54, 26]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/inline-reflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/inline-reflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/inline-reflow-expected.txt
new file mode 100644
index 0000000..fc0dbba
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/inline-reflow-expected.txt
@@ -0,0 +1,16 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 450, 300],
+        [0, 0, 300, 450],
+        [0, 450, 270, 30]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/insert-frame-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/insert-frame-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/insert-frame-expected.txt
new file mode 100644
index 0000000..8c31e960
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/insert-frame-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 156, 156]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/invalidate-caret-before-text-node-update-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/invalidate-caret-before-text-node-update-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/invalidate-caret-before-text-node-update-expected.png
new file mode 100644
index 0000000..a800364
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/invalidate-caret-before-text-node-update-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/invalidate-caret-before-text-node-update-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/invalidate-caret-before-text-node-update-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/invalidate-caret-before-text-node-update-expected.txt
new file mode 100644
index 0000000..11b873cd
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/invalidate-caret-before-text-node-update-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 14, 27],
+        [25, 12, 2, 27]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/invalidate-descendants-when-receiving-paint-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/invalidate-descendants-when-receiving-paint-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/invalidate-descendants-when-receiving-paint-layer-expected.txt
index 55a98a344..b633dff 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/invalidate-descendants-when-receiving-paint-layer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/invalidate-descendants-when-receiving-paint-layer-expected.txt
@@ -1,30 +1,13 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "invalidations": [
         [14, 14, 150, 150]
       ]
-    },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV",
-      "contentsOpaque": true,
-      "drawsContent": false,
-      "transform": 1
-    }
-  ],
-  "transforms": [
-    {
-      "id": 1,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [12, 12, 0, 1]
-      ]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/invalidate-invisible-element-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/invalidate-invisible-element-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/invalidate-invisible-element-expected.txt
new file mode 100644
index 0000000..c91094b
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/invalidate-invisible-element-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [300, 450, 300, 300]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt
index 36876d20..dfbbbcd 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 3525],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -11,10 +11,9 @@
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/invalidation-on-foreground-graphics-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/invalidation-on-foreground-graphics-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/invalidation-on-foreground-graphics-layer-expected.txt
new file mode 100644
index 0000000..e5e1ee0
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/invalidation-on-foreground-graphics-layer-expected.txt
@@ -0,0 +1,79 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV",
+      "bounds": [300, 300],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV",
+      "bounds": [278, 278],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV",
+      "bounds": [450, 450],
+      "contentsOpaque": true,
+      "backgroundColor": "#D3D3D3",
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 278],
+      "bounds": [278, 22],
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [278, 0],
+      "bounds": [22, 278],
+      "transform": 1
+    },
+    {
+      "name": "Scroll corner of LayoutNGBlockFlow DIV",
+      "position": [278, 278],
+      "bounds": [22, 22],
+      "contentsOpaque": true,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV",
+      "bounds": [300, 300],
+      "contentsOpaque": true,
+      "backgroundColor": "#ADD8E6",
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV",
+      "position": [150, 150],
+      "bounds": [300, 300],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "invalidations": [
+        [0, 0, 300, 300]
+      ],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/invalidation-with-zero-size-object-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/invalidation-with-zero-size-object-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/invalidation-with-zero-size-object-expected.txt
new file mode 100644
index 0000000..f6d414c
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/invalidation-with-zero-size-object-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 300, 300]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/invalidations-in-iframe-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/invalidations-in-iframe-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/invalidations-in-iframe-expected.txt
new file mode 100644
index 0000000..79b0019d
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/invalidations-in-iframe-expected.txt
@@ -0,0 +1,45 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 237, 300, 300]
+      ]
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#8888FF",
+      "invalidations": [
+        [0, 0, 150, 150]
+      ],
+      "transform": 2
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/invisible-objects-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/invisible-objects-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/invisible-objects-expected.txt
new file mode 100644
index 0000000..36ece76f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/invisible-objects-expected.txt
@@ -0,0 +1,11 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/layer-full-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/layer-full-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/layer-full-repaint-expected.txt
new file mode 100644
index 0000000..72edcfd
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/layer-full-repaint-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/layer-hide-when-needs-layout-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/layer-hide-when-needs-layout-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/layer-hide-when-needs-layout-expected.txt
new file mode 100644
index 0000000..72edcfd
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/layer-hide-when-needs-layout-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/layer-visibility-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/layer-visibility-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/layer-visibility-expected.txt
new file mode 100644
index 0000000..1e6ef8b
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/layer-visibility-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [150, 0, 150, 150],
+        [0, 0, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-1-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-1-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-1-expected.txt
index 1e0f9bb..2ff79fdf 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-1-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-1-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-10-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-10-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-10-expected.txt
index d7150060..d75ed83e 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-10-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-10-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-2-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-2-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-2-expected.txt
new file mode 100644
index 0000000..afeb2c3e
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-2-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 111, 624, 748]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-3-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-3-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-3-expected.txt
index ae5823a..8305178 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-3-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-3-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-4-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-4-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-4-expected.txt
index 2ced287..7ff533ed 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-4-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-4-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-5-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-5-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-5-expected.txt
index bb8d4d1..1ec9551 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-5-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-5-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-6-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-6-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-6-expected.txt
new file mode 100644
index 0000000..16b5102
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-6-expected.txt
@@ -0,0 +1,21 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [19, 362, 611, 189],
+        [19, 713, 610, 135],
+        [19, 281, 610, 107],
+        [19, 119, 534, 162],
+        [19, 632, 534, 80],
+        [19, 578, 534, 80],
+        [96, 551, 457, 27],
+        [39, 528, 33, 26]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-7-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-7-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-7-expected.txt
new file mode 100644
index 0000000..4e5a87b0
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-7-expected.txt
@@ -0,0 +1,20 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [19, 362, 611, 189],
+        [19, 713, 610, 135],
+        [19, 281, 610, 107],
+        [19, 119, 534, 162],
+        [19, 632, 534, 80],
+        [19, 578, 534, 80],
+        [96, 551, 457, 27]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-8-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-8-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-8-expected.txt
index b6d27687..decb8c47 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-8-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-8-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-9-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-9-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-9-expected.txt
index ddcc3a93..aad9eab 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-9-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/line-flow-with-floats-9-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -10,16 +10,16 @@
       ]
     },
     {
-      "name": "Scrolling Contents Layer",
+      "name": "VerticalScrollbar",
+      "position": [728, 0],
+      "bounds": [22, 900]
+    },
+    {
+      "name": "LayoutNGBlockFlow HTML",
       "bounds": [728, 906],
       "invalidations": [
         [0, 0, 728, 906]
       ]
-    },
-    {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "position": [728, 0],
-      "bounds": [22, 900]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/lines-with-layout-delta-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/lines-with-layout-delta-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/lines-with-layout-delta-expected.txt
new file mode 100644
index 0000000..43d55b8
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/lines-with-layout-delta-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 87, 54, 26]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/list-marker-2-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/list-marker-2-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/list-marker-2-expected.txt
new file mode 100644
index 0000000..6722ad458
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/list-marker-2-expected.txt
@@ -0,0 +1,16 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [72, 141, 150, 150],
+        [50, 270, 9, 26],
+        [50, 195, 9, 26]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/make-children-non-inline-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/make-children-non-inline-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/make-children-non-inline-expected.txt
new file mode 100644
index 0000000..cf92def
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/make-children-non-inline-expected.txt
@@ -0,0 +1,27 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 375, 171, 26],
+        [12, 225, 171, 26],
+        [12, 198, 121, 26],
+        [12, 144, 120, 26],
+        [12, 402, 105, 26],
+        [12, 252, 105, 26],
+        [12, 456, 96, 26],
+        [12, 306, 96, 26],
+        [12, 171, 68, 26],
+        [12, 117, 64, 26],
+        [12, 90, 59, 26],
+        [12, 429, 45, 26],
+        [12, 279, 45, 26],
+        [12, 225, 15, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/mix-blend-mode-separate-stacking-context-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/mix-blend-mode-separate-stacking-context-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/mix-blend-mode-separate-stacking-context-expected.txt
new file mode 100644
index 0000000..d5c7d6a
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/mix-blend-mode-separate-stacking-context-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 1200, 900]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multi-layout-one-frame-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multi-layout-one-frame-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multi-layout-one-frame-expected.txt
index 5314fef..207f49b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multi-layout-one-frame-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multi-layout-one-frame-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/column-float-under-stacked-inline-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/column-float-under-stacked-inline-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/column-float-under-stacked-inline-expected.png
new file mode 100644
index 0000000..be5b2bfd
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/column-float-under-stacked-inline-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/column-rules-fixed-height-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/column-rules-fixed-height-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/column-rules-fixed-height-expected.txt
new file mode 100644
index 0000000..e11ab669
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/column-rules-fixed-height-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [162, 75, 637, 473]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/multicol-relpos-with-abspos-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/multicol-relpos-with-abspos-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/multicol-relpos-with-abspos-expected.txt
new file mode 100644
index 0000000..ced0b14
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/multicol-relpos-with-abspos-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [927, 42, 30, 30]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/multicol-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/multicol-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/multicol-repaint-expected.txt
new file mode 100644
index 0000000..00eb86d
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/multicol-repaint-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [351, 22, 450, 75],
+        [13, 15, 20, 83]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/multicol-resize-with-rule-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/multicol-resize-with-rule-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/multicol-resize-with-rule-expected.txt
new file mode 100644
index 0000000..1e48c52
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/multicol-resize-with-rule-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [114, 12, 696, 300],
+        [77, 12, 471, 300]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/multicol-with-abspos-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/multicol-with-abspos-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/multicol-with-abspos-expected.txt
new file mode 100644
index 0000000..5cb5763c
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/multicol-with-abspos-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 870, 120, 30]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/multicol-with-abspos-in-relpos-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/multicol-with-abspos-in-relpos-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/multicol-with-abspos-in-relpos-expected.txt
new file mode 100644
index 0000000..eb5e629
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/multicol-with-abspos-in-relpos-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [762, 42, 120, 30]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/multicol-with-block-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/multicol-with-block-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/multicol-with-block-expected.txt
new file mode 100644
index 0000000..23acad97
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/multicol-with-block-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [732, 12, 120, 30]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/multicol-with-inline-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/multicol-with-inline-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/multicol-with-inline-expected.txt
new file mode 100644
index 0000000..23acad97
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/multicol-with-inline-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [732, 12, 120, 30]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/multicol-with-overflowing-block-rl-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/multicol-with-overflowing-block-rl-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/multicol-with-overflowing-block-rl-expected.txt
index 1d2c53d..e2dd1ae 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/multicol-with-overflowing-block-rl-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/multicol-with-overflowing-block-rl-expected.txt
@@ -1,14 +1,12 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
-      "backgroundColor": "#008000",
+      "backgroundColor": "#FFFFFF",
       "invalidations": [
-        [12, 512, 750, 250],
-        [12, 262, 750, 250],
-        [12, 12, 750, 250]
+        [12, 12, 750, 750]
       ]
     }
   ]

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/multicol-with-relpos-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/multicol-with-relpos-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/multicol-with-relpos-expected.txt
new file mode 100644
index 0000000..9061474
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/multicol-with-relpos-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [762, 42, 225, 30]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/multicol-with-text-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/multicol-with-text-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/multicol-with-text-expected.txt
new file mode 100644
index 0000000..23acad97
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/multicol/multicol-with-text-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [732, 12, 120, 30]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/non-text-link-invalidation-optimization-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/non-text-link-invalidation-optimization-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/non-text-link-invalidation-optimization-expected.txt
new file mode 100644
index 0000000..f2b6d58e
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/non-text-link-invalidation-optimization-expected.txt
@@ -0,0 +1,19 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [253, 12, 227, 26],
+        [116, 12, 94, 27],
+        [12, 12, 89, 26],
+        [546, 12, 81, 27],
+        [210, 12, 43, 27],
+        [495, 12, 36, 26]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/offset-change-wrong-invalidation-with-float-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/offset-change-wrong-invalidation-with-float-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/offset-change-wrong-invalidation-with-float-expected.txt
new file mode 100644
index 0000000..2145d4ff
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/offset-change-wrong-invalidation-with-float-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [72, 138, 60, 27]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/opacity-from-zero-to-non-zero-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/opacity-from-zero-to-non-zero-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/opacity-from-zero-to-non-zero-expected.txt
new file mode 100644
index 0000000..72edcfd
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/opacity-from-zero-to-non-zero-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/border-outline-0-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/border-outline-0-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/border-outline-0-expected.txt
new file mode 100644
index 0000000..2045c440
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/border-outline-0-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [15, 15, 300, 300]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/border-radius-with-outline-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/border-radius-with-outline-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/border-radius-with-outline-expected.txt
new file mode 100644
index 0000000..ce1d342
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/border-radius-with-outline-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [68, 68, 464, 464]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/focus-continuations-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/focus-continuations-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/focus-continuations-expected.txt
new file mode 100644
index 0000000..81569738
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/focus-continuations-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [8, 128, 133, 38]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/focus-enable-continuations-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/focus-enable-continuations-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/focus-enable-continuations-expected.png
index 5d82e29e..cdd73153 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/focus-enable-continuations-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/focus-enable-continuations-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/focus-enable-continuations-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/focus-enable-continuations-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/focus-enable-continuations-expected.txt
new file mode 100644
index 0000000..81569738
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/focus-enable-continuations-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [8, 128, 133, 38]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/focus-ring-on-child-move-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/focus-ring-on-child-move-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/focus-ring-on-child-move-expected.txt
new file mode 100644
index 0000000..d2cf859
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/focus-ring-on-child-move-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [450, 75, 30, 450],
+        [225, 75, 30, 450]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/focus-ring-on-continuation-move-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/focus-ring-on-continuation-move-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/focus-ring-on-continuation-move-expected.txt
new file mode 100644
index 0000000..dc0be75
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/focus-ring-on-continuation-move-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [308, 344, 158, 158],
+        [8, 344, 158, 158]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/focus-ring-on-inline-continuation-move-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/focus-ring-on-inline-continuation-move-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/focus-ring-on-inline-continuation-move-expected.txt
new file mode 100644
index 0000000..857eb4a7
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/focus-ring-on-inline-continuation-move-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [8, 8, 158, 163],
+        [8, 128, 158, 158]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/inline-outline-repaint-2-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/inline-outline-repaint-2-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/inline-outline-repaint-2-expected.txt
new file mode 100644
index 0000000..4faad2dd
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/inline-outline-repaint-2-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [316, 0, 74, 22]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/inline-outline-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/inline-outline-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/inline-outline-repaint-expected.txt
new file mode 100644
index 0000000..11bf0c5a
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/inline-outline-repaint-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [9, 246, 146, 59]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-add-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-add-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-add-repaint-expected.txt
new file mode 100644
index 0000000..3ecf2463
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-add-repaint-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 165, 165]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-become-affected-by-descendant-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-become-affected-by-descendant-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-become-affected-by-descendant-expected.txt
new file mode 100644
index 0000000..2e3a32a8
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-become-affected-by-descendant-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [8, 8, 233, 158]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-become-not-affected-by-descendant-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-become-not-affected-by-descendant-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-become-not-affected-by-descendant-expected.txt
new file mode 100644
index 0000000..2e3a32a8
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-become-not-affected-by-descendant-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [8, 8, 233, 158]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-change-continuations-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-change-continuations-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-change-continuations-expected.txt
new file mode 100644
index 0000000..36ece76f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-change-continuations-expected.txt
@@ -0,0 +1,11 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-change-invalidation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-change-invalidation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-change-invalidation-expected.txt
new file mode 100644
index 0000000..d9125e0
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-change-invalidation-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [65, 119, 1130, 41]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-change-offset-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-change-offset-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-change-offset-expected.txt
new file mode 100644
index 0000000..79955f5
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-change-offset-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [53, 53, 194, 194]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-change-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-change-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-change-repaint-expected.txt
new file mode 100644
index 0000000..3ecf2463
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-change-repaint-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 165, 165]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-change-vertical-rl-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-change-vertical-rl-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-change-vertical-rl-expected.txt
new file mode 100644
index 0000000..a35cb2d4
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-change-vertical-rl-expected.txt
@@ -0,0 +1,31 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1524, 878],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 1524, 192]
+      ],
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 878],
+      "bounds": [1200, 22]
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [-324, 0, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-child-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-child-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-child-repaint-expected.txt
new file mode 100644
index 0000000..b43e5079
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-child-repaint-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 360, 330, 75],
+        [0, 210, 330, 75]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-containing-image-in-non-standard-mode-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-containing-image-in-non-standard-mode-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-containing-image-in-non-standard-mode-expected.txt
new file mode 100644
index 0000000..f818203
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-containing-image-in-non-standard-mode-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [9, 9, 306, 86]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-continuations-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-continuations-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-continuations-expected.txt
new file mode 100644
index 0000000..8fd5b51
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-continuations-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [24, 219, 131, 32],
+        [24, 162, 131, 32]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-current-color-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-current-color-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-current-color-expected.txt
new file mode 100644
index 0000000..3049d67d
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-current-color-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [72, 285, 180, 180]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-inset-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-inset-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-inset-expected.txt
index 01c7312..795871ee 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-inset-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-inset-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-not-affected-by-descendant-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-not-affected-by-descendant-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-not-affected-by-descendant-expected.txt
new file mode 100644
index 0000000..f8bdd4e0
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-not-affected-by-descendant-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 75, 75]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-repaint-glitch-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-repaint-glitch-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-repaint-glitch-expected.txt
index b571c3a1..dc5fa62 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-repaint-glitch-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-repaint-glitch-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-shrinking-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-shrinking-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-shrinking-expected.txt
new file mode 100644
index 0000000..b7a9f35
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/outline/outline-shrinking-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [6, 162, 162, 162]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/align-items-overflow-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/align-items-overflow-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/align-items-overflow-change-expected.txt
new file mode 100644
index 0000000..48eaa05b8
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/align-items-overflow-change-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 78, 300, 300],
+        [0, 3, 300, 300]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/align-self-overflow-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/align-self-overflow-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/align-self-overflow-change-expected.txt
new file mode 100644
index 0000000..48eaa05b8
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/align-self-overflow-change-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 78, 300, 300],
+        [0, 3, 300, 300]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/clipped-overflow-visible-subtree-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/clipped-overflow-visible-subtree-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/clipped-overflow-visible-subtree-expected.txt
new file mode 100644
index 0000000..58ce4334
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/clipped-overflow-visible-subtree-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [462, 12, 150, 150],
+        [12, 12, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/composited-overflow-local-background-removed-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/composited-overflow-local-background-removed-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/composited-overflow-local-background-removed-expected.txt
new file mode 100644
index 0000000..b83b03b
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/composited-overflow-local-background-removed-expected.txt
@@ -0,0 +1,60 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "bounds": [300, 300],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "bounds": [278, 278],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 278],
+      "bounds": [300, 22],
+      "contentsOpaqueForText": true,
+      "invalidations": [
+        [0, 0, 278, 22]
+      ],
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [278, 0],
+      "bounds": [22, 278],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "position": [0, 24],
+      "bounds": [278, 501],
+      "invalidations": [
+        [0, 0, 278, 501]
+      ],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/composited-overflow-with-borderbox-background-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/composited-overflow-with-borderbox-background-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/composited-overflow-with-borderbox-background-expected.txt
new file mode 100644
index 0000000..a4dfff55
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/composited-overflow-with-borderbox-background-expected.txt
@@ -0,0 +1,56 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 330, 330]
+      ]
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "position": [15, 15],
+      "bounds": [278, 278],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "position": [15, 15],
+      "bounds": [278, 450],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "invalidations": [
+        [0, 0, 278, 450]
+      ],
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [15, 293],
+      "bounds": [300, 22],
+      "contentsOpaqueForText": true,
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [293, 15],
+      "bounds": [22, 278],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/composited-overflow-with-local-background-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/composited-overflow-with-local-background-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/composited-overflow-with-local-background-expected.txt
new file mode 100644
index 0000000..bbfdce5
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/composited-overflow-with-local-background-expected.txt
@@ -0,0 +1,58 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "bounds": [300, 300],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "bounds": [278, 278],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "bounds": [278, 450],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "invalidations": [
+        [0, 0, 278, 450]
+      ],
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 278],
+      "bounds": [300, 22],
+      "contentsOpaqueForText": true,
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [278, 0],
+      "bounds": [22, 278],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/composited-overflow-with-negative-offset-outline-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/composited-overflow-with-negative-offset-outline-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/composited-overflow-with-negative-offset-outline-expected.txt
new file mode 100644
index 0000000..86ab06d
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/composited-overflow-with-negative-offset-outline-expected.txt
@@ -0,0 +1,64 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "bounds": [300, 300],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "bounds": [278, 278],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 278],
+      "bounds": [300, 22],
+      "contentsOpaqueForText": true,
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [278, 0],
+      "bounds": [22, 278],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "bounds": [278, 450],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "bounds": [300, 300],
+      "contentsOpaqueForText": true,
+      "invalidations": [
+        [0, 0, 300, 300]
+      ],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/composited-vertical-rl-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/composited-vertical-rl-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/composited-vertical-rl-overflow-expected.txt
new file mode 100644
index 0000000..89ff461
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/composited-vertical-rl-overflow-expected.txt
@@ -0,0 +1,33 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='div'",
+      "position": [-75, 0],
+      "bounds": [225, 150],
+      "contentsOpaqueForText": true,
+      "backgroundColor": "#0000FF",
+      "invalidations": [
+        [0, 0, 225, 150]
+      ],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [150, 150, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/content-into-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/content-into-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/content-into-overflow-expected.txt
new file mode 100644
index 0000000..3590d2e
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/content-into-overflow-expected.txt
@@ -0,0 +1,16 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 237, 159, 159],
+        [12, 12, 159, 159],
+        [12, 462, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/erase-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/erase-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/erase-overflow-expected.txt
new file mode 100644
index 0000000..d7618ea
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/erase-overflow-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 162, 150, 150],
+        [12, 12, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/fixed-position-transparency-with-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/fixed-position-transparency-with-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/fixed-position-transparency-with-overflow-expected.txt
new file mode 100644
index 0000000..c7af9a9
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/fixed-position-transparency-with-overflow-expected.txt
@@ -0,0 +1,40 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 3024],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [162, 462, 150, 150],
+        [12, 312, 150, 150]
+      ]
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV id='container' class='relative blue'",
+      "position": [12, 312],
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#0000FF",
+      "invalidations": [
+        [0, 0, 150, 150]
+      ]
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='absolute green'",
+      "position": [162, 462],
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "invalidations": [
+        [0, 0, 150, 150]
+      ]
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/float-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/float-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/float-overflow-expected.txt
index ad543ec..a8b2c41 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/float-overflow-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/float-overflow-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/float-overflow-right-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/float-overflow-right-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/float-overflow-right-expected.txt
index a7b0d45..c0aa3b4 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/float-overflow-right-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/float-overflow-right-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/inline-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/inline-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/inline-overflow-expected.txt
new file mode 100644
index 0000000..50a5a8b6
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/inline-overflow-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [49, 49, 376, 151]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/inline-vertical-lr-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/inline-vertical-lr-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/inline-vertical-lr-overflow-expected.txt
new file mode 100644
index 0000000..e6c1367
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/inline-vertical-lr-overflow-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [49, 49, 151, 376]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/inline-vertical-rl-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/inline-vertical-rl-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/inline-vertical-rl-overflow-expected.txt
new file mode 100644
index 0000000..45ba85f4
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/inline-vertical-rl-overflow-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [1000, 49, 151, 376]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/justify-items-overflow-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/justify-items-overflow-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/justify-items-overflow-change-expected.txt
new file mode 100644
index 0000000..ff759db
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/justify-items-overflow-change-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 78, 240, 450]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/justify-self-overflow-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/justify-self-overflow-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/justify-self-overflow-change-expected.txt
new file mode 100644
index 0000000..a78f70a
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/justify-self-overflow-change-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 78, 225, 450]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/line-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/line-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/line-overflow-expected.txt
new file mode 100644
index 0000000..c8f5f5c4
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/line-overflow-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 117, 300, 81],
+        [12, 198, 299, 107]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/negative-text-indent-with-overflow-hidden-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/negative-text-indent-with-overflow-hidden-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/negative-text-indent-with-overflow-hidden-expected.txt
new file mode 100644
index 0000000..e0574d2e
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/negative-text-indent-with-overflow-hidden-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [825, 12, 300, 75]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/opacity-change-on-overflow-float-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/opacity-change-on-overflow-float-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/opacity-change-on-overflow-float-expected.txt
new file mode 100644
index 0000000..cc7b3007
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/opacity-change-on-overflow-float-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 1125, 81],
+        [12, 117, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/overflow-changed-on-child-of-composited-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/overflow-changed-on-child-of-composited-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/overflow-changed-on-child-of-composited-layer-expected.txt
index 5b6864b1..68afa37 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/overflow-changed-on-child-of-composited-layer-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/overflow-changed-on-child-of-composited-layer-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -10,6 +10,7 @@
       "name": "LayoutNGBlockFlow DIV id='parent'",
       "position": [-15, -15],
       "bounds": [1131, 315],
+      "contentsOpaqueForText": true,
       "invalidations": [
         [0, 0, 180, 315],
         [315, 30, 150, 150],

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/overflow-clip-subtree-layout-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/overflow-clip-subtree-layout-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/overflow-clip-subtree-layout-expected.txt
new file mode 100644
index 0000000..36ece76f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/overflow-clip-subtree-layout-expected.txt
@@ -0,0 +1,11 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/overflow-delete-line-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/overflow-delete-line-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/overflow-delete-line-expected.txt
new file mode 100644
index 0000000..d44a9735
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/overflow-delete-line-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 105, 111, 27],
+        [12, 105, 65, 54]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/overflow-hide-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/overflow-hide-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/overflow-hide-expected.txt
new file mode 100644
index 0000000..b4bac83
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/overflow-hide-expected.txt
@@ -0,0 +1,20 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 3024],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [162, 162, 150, 150],
+        [12, 12, 150, 150]
+      ]
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/overflow-into-content-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/overflow-into-content-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/overflow-into-content-expected.txt
new file mode 100644
index 0000000..3590d2e
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/overflow-into-content-expected.txt
@@ -0,0 +1,16 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 237, 159, 159],
+        [12, 12, 159, 159],
+        [12, 462, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/overflow-show-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/overflow-show-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/overflow-show-expected.txt
new file mode 100644
index 0000000..b4bac83
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/overflow-show-expected.txt
@@ -0,0 +1,20 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 3024],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [162, 162, 150, 150],
+        [12, 12, 150, 150]
+      ]
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/rel-positioned-inline-with-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/rel-positioned-inline-with-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/rel-positioned-inline-with-overflow-expected.txt
new file mode 100644
index 0000000..575e307c
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/rel-positioned-inline-with-overflow-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 138, 150, 75]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/repaint-resized-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/repaint-resized-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/repaint-resized-overflow-expected.txt
new file mode 100644
index 0000000..4d95cd8
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/repaint-resized-overflow-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 222, 162, 162]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/trailing-floats-root-line-box-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/trailing-floats-root-line-box-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/trailing-floats-root-line-box-overflow-expected.txt
new file mode 100644
index 0000000..e6230c6f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/trailing-floats-root-line-box-overflow-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 87, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/vertical-overflow-child-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/vertical-overflow-child-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/vertical-overflow-child-expected.txt
index 62a09e7f..5eea2b4f 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/vertical-overflow-child-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/vertical-overflow-child-expected.txt
@@ -1,38 +1,36 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow DIV class='container'",
-      "bounds": [453, 303],
+      "position": [2, 2],
+      "bounds": [428, 278],
+      "drawsContent": false,
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [1, 280],
       "bounds": [428, 22],
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "position": [430, 1],
-      "bounds": [22, 278],
+      "name": "VerticalScrollbar",
+      "position": [429, 1],
+      "bounds": [23, 300],
+      "contentsOpaqueForText": true,
       "transform": 1
     },
     {
-      "name": "Scroll Corner Layer",
-      "position": [429, 279],
-      "bounds": [22, 22],
-      "transform": 1
-    },
-    {
-      "name": "Scrolling Contents Layer",
+      "name": "LayoutNGBlockFlow DIV class='container'",
       "position": [2, 2],
-      "bounds": [3150, 278],
+      "bounds": [3150, 150],
+      "contentsOpaqueForText": true,
       "invalidations": [
         [3000, 0, 150, 150]
       ],

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/vertical-overflow-parent-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/vertical-overflow-parent-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/vertical-overflow-parent-expected.txt
new file mode 100644
index 0000000..bf259d6
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/vertical-overflow-parent-expected.txt
@@ -0,0 +1,52 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV class='container'",
+      "position": [2, 2],
+      "bounds": [428, 278],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [1, 280],
+      "bounds": [428, 22],
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [429, 1],
+      "bounds": [23, 300],
+      "contentsOpaqueForText": true,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV class='container'",
+      "position": [2, 2],
+      "bounds": [3150, 150],
+      "contentsOpaqueForText": true,
+      "invalidations": [
+        [0, 0, 150, 150]
+      ],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [42, 42, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/vertical-overflow-same-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/vertical-overflow-same-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/vertical-overflow-same-expected.txt
new file mode 100644
index 0000000..1193fbbe
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/vertical-overflow-same-expected.txt
@@ -0,0 +1,52 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV class='vertical-rl container'",
+      "position": [2, 2],
+      "bounds": [428, 278],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [1, 280],
+      "bounds": [428, 22],
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [429, 1],
+      "bounds": [23, 300],
+      "contentsOpaqueForText": true,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV class='vertical-rl container'",
+      "position": [2, 2],
+      "bounds": [3150, 150],
+      "contentsOpaqueForText": true,
+      "invalidations": [
+        [0, 0, 150, 150]
+      ],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [42, 30, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/vertical-rl-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/vertical-rl-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/vertical-rl-overflow-expected.txt
new file mode 100644
index 0000000..0c78de0c
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overflow/vertical-rl-overflow-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [75, 150, 225, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overhanging-float-detach-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overhanging-float-detach-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overhanging-float-detach-repaint-expected.txt
new file mode 100644
index 0000000..4886ec2
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/overhanging-float-detach-repaint-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 93, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/paint-caret-in-div-with-negative-indent-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/paint-caret-in-div-with-negative-indent-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/paint-caret-in-div-with-negative-indent-expected.txt
new file mode 100644
index 0000000..f871dbaf
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/paint-caret-in-div-with-negative-indent-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [537, 300, 2, 30]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/paint-invalidation-with-opacity-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/paint-invalidation-with-opacity-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/paint-invalidation-with-opacity-expected.txt
new file mode 100644
index 0000000..72edcfd
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/paint-invalidation-with-opacity-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/paint-invalidation-with-reparent-across-frame-boundaries-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/paint-invalidation-with-reparent-across-frame-boundaries-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/paint-invalidation-with-reparent-across-frame-boundaries-expected.txt
new file mode 100644
index 0000000..eda07656
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/paint-invalidation-with-reparent-across-frame-boundaries-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [27, 27, 34, 26],
+        [12, 303, 34, 26]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/absolute-display-block-to-none-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/absolute-display-block-to-none-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/absolute-display-block-to-none-expected.txt
new file mode 100644
index 0000000..8717a5fb
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/absolute-display-block-to-none-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 959, 27],
+        [150, 150, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/absolute-margin-change-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/absolute-margin-change-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/absolute-margin-change-repaint-expected.txt
new file mode 100644
index 0000000..86398ff
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/absolute-margin-change-repaint-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 90, 150, 150],
+        [0, 60, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/absolute-position-change-containing-block-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/absolute-position-change-containing-block-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/absolute-position-change-containing-block-expected.txt
new file mode 100644
index 0000000..0ee7de5
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/absolute-position-change-containing-block-expected.txt
@@ -0,0 +1,20 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 3024],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [150, 150, 150, 150],
+        [12, 12, 150, 150]
+      ]
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/absolute-position-changed-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/absolute-position-changed-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/absolute-position-changed-expected.txt
new file mode 100644
index 0000000..0e6bfb5
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/absolute-position-changed-expected.txt
@@ -0,0 +1,50 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 3024],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='fixed red'",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#FF0000",
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='absoluteDiv' class='absolute green'",
+      "position": [150, 1050],
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "invalidations": [
+        [0, 0, 150, 150]
+      ],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -750, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [150, 300, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/absolute-position-moved-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/absolute-position-moved-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/absolute-position-moved-expected.txt
new file mode 100644
index 0000000..11c26b0
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/absolute-position-moved-expected.txt
@@ -0,0 +1,19 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 3024],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [150, 150, 150, 150]
+      ]
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/abspos-shift-image-incorrect-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/abspos-shift-image-incorrect-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/abspos-shift-image-incorrect-repaint-expected.txt
new file mode 100644
index 0000000..938d214
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/abspos-shift-image-incorrect-repaint-expected.txt
@@ -0,0 +1,23 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1875, 878],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [1056, 0, 321, 348],
+        [681, 0, 321, 348],
+        [0, 0, 321, 348],
+        [1050, 327, 6, 26],
+        [675, 327, 6, 26]
+      ]
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 878],
+      "bounds": [1200, 22]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/align-content-position-change-grid-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/align-content-position-change-grid-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/align-content-position-change-grid-expected.txt
new file mode 100644
index 0000000..37288d7
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/align-content-position-change-grid-expected.txt
@@ -0,0 +1,19 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 453, 300, 75],
+        [0, 378, 300, 75],
+        [0, 303, 300, 75],
+        [0, 228, 300, 75],
+        [0, 153, 300, 75],
+        [0, 78, 300, 75]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/background-position-no-image-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/background-position-no-image-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/background-position-no-image-expected.txt
new file mode 100644
index 0000000..36ece76f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/background-position-no-image-expected.txt
@@ -0,0 +1,11 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/block-layout-inline-children-float-positioned-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/block-layout-inline-children-float-positioned-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/block-layout-inline-children-float-positioned-expected.txt
new file mode 100644
index 0000000..aa40f266
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/block-layout-inline-children-float-positioned-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [453, 53, 449, 27],
+        [227, 53, 449, 27]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/containing-block-position-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/containing-block-position-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/containing-block-position-change-expected.txt
new file mode 100644
index 0000000..89ac83f3
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/containing-block-position-change-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [237, 105, 75, 75],
+        [150, 105, 75, 75]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/fixed-element-repaint-after-compositing-update-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/fixed-element-repaint-after-compositing-update-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/fixed-element-repaint-after-compositing-update-expected.txt
new file mode 100644
index 0000000..7f21e96
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/fixed-element-repaint-after-compositing-update-expected.txt
@@ -0,0 +1,21 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='fixedOverlapping'",
+      "position": [12, 153],
+      "bounds": [1188, 747],
+      "contentsOpaqueForText": true,
+      "invalidations": [
+        [213, 72, 150, 150],
+        [0, 0, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/fixed-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/fixed-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/fixed-expected.txt
new file mode 100644
index 0000000..cd1a744
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/fixed-expected.txt
@@ -0,0 +1,47 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 3024],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='t'",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "invalidations": [
+        [0, 0, 150, 150]
+      ],
+      "transform": 2
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -30, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 150, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/fixed-margin-change-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/fixed-margin-change-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/fixed-margin-change-repaint-expected.txt
new file mode 100644
index 0000000..b62c5dd9
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/fixed-margin-change-repaint-expected.txt
@@ -0,0 +1,21 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='test'",
+      "position": [0, 90],
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "invalidations": [
+        [0, 0, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/fixed-to-relative-position-with-absolute-child-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/fixed-to-relative-position-with-absolute-child-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/fixed-to-relative-position-with-absolute-child-expected.txt
new file mode 100644
index 0000000..af2635cb
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/fixed-to-relative-position-with-absolute-child-expected.txt
@@ -0,0 +1,20 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 3024],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [162, 462, 150, 150],
+        [12, 312, 150, 150]
+      ]
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/fixed-tranformed-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/fixed-tranformed-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/fixed-tranformed-expected.txt
new file mode 100644
index 0000000..b863309
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/fixed-tranformed-expected.txt
@@ -0,0 +1,48 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 1500],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='test'",
+      "position": [75, 75],
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "invalidations": [
+        [0, 0, 150, 150]
+      ],
+      "transform": 2
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -75, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [15, 15, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/inline-relative-positioned-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/inline-relative-positioned-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/inline-relative-positioned-expected.txt
new file mode 100644
index 0000000..cd165b5b
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/inline-relative-positioned-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 132, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/intermediate-layout-position-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/intermediate-layout-position-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/intermediate-layout-position-expected.txt
new file mode 100644
index 0000000..30b09ac
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/intermediate-layout-position-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 222, 69, 66],
+        [12, 111, 69, 30]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/invalidate-paint-for-fixed-pos-inside-iframe-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/invalidate-paint-for-fixed-pos-inside-iframe-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/invalidate-paint-for-fixed-pos-inside-iframe-expected.txt
new file mode 100644
index 0000000..1855870
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/invalidate-paint-for-fixed-pos-inside-iframe-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [27, 627, 75, 75]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/justify-content-position-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/justify-content-position-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/justify-content-position-change-expected.txt
new file mode 100644
index 0000000..85d12d2
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/justify-content-position-change-expected.txt
@@ -0,0 +1,17 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [150, 78, 78, 450],
+        [78, 78, 78, 450],
+        [72, 78, 78, 450],
+        [0, 78, 78, 450]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/justify-content-position-change-grid-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/justify-content-position-change-grid-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/justify-content-position-change-grid-expected.txt
new file mode 100644
index 0000000..06e7aff2
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/justify-content-position-change-grid-expected.txt
@@ -0,0 +1,19 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [375, 78, 75, 300],
+        [300, 78, 75, 300],
+        [225, 78, 75, 300],
+        [150, 78, 75, 300],
+        [75, 78, 75, 300],
+        [0, 78, 75, 300]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/layout-state-only-positioned-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/layout-state-only-positioned-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/layout-state-only-positioned-expected.txt
new file mode 100644
index 0000000..deaccaa
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/layout-state-only-positioned-expected.txt
@@ -0,0 +1,49 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 75, 156, 156]
+      ]
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV",
+      "position": [3, 3],
+      "bounds": [150, 150],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='q'",
+      "position": [3, 3],
+      "bounds": [15, 300],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "invalidations": [
+        [0, 0, 15, 300]
+      ],
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [131, 3],
+      "bounds": [22, 150],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, 75, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/layout-state-relative-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/layout-state-relative-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/layout-state-relative-expected.txt
new file mode 100644
index 0000000..5f77e2b
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/layout-state-relative-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 225, 54, 26]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/layoutstate-invalid-invalidation-inline-relative-positioned-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/layoutstate-invalid-invalidation-inline-relative-positioned-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/layoutstate-invalid-invalidation-inline-relative-positioned-expected.txt
new file mode 100644
index 0000000..b134826
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/layoutstate-invalid-invalidation-inline-relative-positioned-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 330, 150, 150],
+        [12, 300, 150, 30]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/position-change-keeping-geometry-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/position-change-keeping-geometry-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/position-change-keeping-geometry-expected.txt
new file mode 100644
index 0000000..238f8fc
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/position-change-keeping-geometry-expected.txt
@@ -0,0 +1,25 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [630, 30, 150, 150],
+        [330, 30, 150, 150]
+      ]
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='target3'",
+      "position": [630, 30],
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#0000FF",
+      "invalidations": [
+        [0, 0, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/positioned-document-element-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/positioned-document-element-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/positioned-document-element-expected.txt
new file mode 100644
index 0000000..b8e5ab36
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/positioned-document-element-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "invalidations": [
+        [0, 0, 1200, 900]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/positioned-great-grandparent-change-location-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/positioned-great-grandparent-change-location-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/positioned-great-grandparent-change-location-expected.txt
new file mode 100644
index 0000000..cfaeb36
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/positioned-great-grandparent-change-location-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [150, 300, 150, 150],
+        [150, 150, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/positioned-list-offset-change-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/positioned-list-offset-change-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/positioned-list-offset-change-repaint-expected.txt
new file mode 100644
index 0000000..910ce2e
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/positioned-list-offset-change-repaint-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 90, 321, 348]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/relative-inline-positioned-movement-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/relative-inline-positioned-movement-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/relative-inline-positioned-movement-repaint-expected.txt
new file mode 100644
index 0000000..3c45479
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/relative-inline-positioned-movement-repaint-expected.txt
@@ -0,0 +1,20 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutInline (relative positioned) DIV id='block'",
+      "position": [102, 10],
+      "bounds": [568, 30],
+      "backfaceVisibility": "hidden",
+      "invalidations": [
+        [0, 0, 568, 30]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/relative-margin-change-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/relative-margin-change-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/relative-margin-change-repaint-expected.txt
new file mode 100644
index 0000000..86398ff
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/relative-margin-change-repaint-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 90, 150, 150],
+        [0, 60, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/relative-positioned-movement-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/relative-positioned-movement-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/relative-positioned-movement-repaint-expected.txt
new file mode 100644
index 0000000..f1f6b27
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/relative-positioned-movement-repaint-expected.txt
@@ -0,0 +1,28 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV id='block'",
+      "bounds": [603, 93],
+      "backfaceVisibility": "hidden",
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [102, 15, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/shift-relative-positioned-container-with-image-addition-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/shift-relative-positioned-container-with-image-addition-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/shift-relative-positioned-container-with-image-addition-expected.txt
new file mode 100644
index 0000000..aa5453b
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/shift-relative-positioned-container-with-image-addition-expected.txt
@@ -0,0 +1,22 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 1244],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 1103, 1178, 141],
+        [12, 129, 1098, 141],
+        [87, 345, 734, 806],
+        [87, 204, 734, 806]
+      ]
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/shift-relative-positioned-container-with-image-removal-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/shift-relative-positioned-container-with-image-removal-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/shift-relative-positioned-container-with-image-removal-expected.txt
index 4526558f..4fae0a8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/shift-relative-positioned-container-with-image-removal-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/shift-relative-positioned-container-with-image-removal-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 1103],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -12,10 +12,9 @@
       ]
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/static-to-positioned-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/static-to-positioned-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/static-to-positioned-expected.txt
new file mode 100644
index 0000000..4e9d72b
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/static-to-positioned-expected.txt
@@ -0,0 +1,17 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 492, 150, 150],
+        [12, 417, 150, 150],
+        [12, 192, 150, 150],
+        [12, 117, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/text-in-relative-positioned-inline-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/text-in-relative-positioned-inline-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/text-in-relative-positioned-inline-expected.txt
new file mode 100644
index 0000000..7822c75
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/text-in-relative-positioned-inline-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 300, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/transform-absolute-child-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/transform-absolute-child-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/transform-absolute-child-expected.txt
index d031a31..30006f9 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/transform-absolute-child-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/transform-absolute-child-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/transform-absolute-in-positioned-container-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/transform-absolute-in-positioned-container-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/transform-absolute-in-positioned-container-expected.txt
new file mode 100644
index 0000000..3d4ccda
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/transform-absolute-in-positioned-container-expected.txt
@@ -0,0 +1,19 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1203, 878],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [114, 279, 429, 429]
+      ]
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 878],
+      "bounds": [1200, 22]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/transform-relative-position-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/transform-relative-position-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/transform-relative-position-expected.txt
new file mode 100644
index 0000000..e92fdc23
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/position/transform-relative-position-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [99, 162, 429, 429]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/push-block-with-first-line-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/push-block-with-first-line-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/push-block-with-first-line-expected.txt
new file mode 100644
index 0000000..df55312
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/push-block-with-first-line-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 102, 210, 30],
+        [12, 12, 210, 30]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/quotes-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/quotes-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/quotes-expected.txt
new file mode 100644
index 0000000..63446fe
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/quotes-expected.txt
@@ -0,0 +1,18 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [26, 39, 72, 27],
+        [24, 39, 72, 27],
+        [98, 39, 14, 26],
+        [12, 39, 14, 26],
+        [96, 39, 12, 26]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/raster-under-invalidation-checking-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/raster-under-invalidation-checking-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/raster-under-invalidation-checking-expected.txt
new file mode 100644
index 0000000..7a68a8f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/raster-under-invalidation-checking-expected.txt
@@ -0,0 +1,1322 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [27, 15, 90, 60]
+      ],
+      "underInvalidations": [
+        {
+          "x": 27,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 28,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 29,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 30,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 31,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 32,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 33,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 34,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 35,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 36,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 37,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 38,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 39,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 40,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 41,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 42,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 43,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 44,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 45,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 46,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 47,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 48,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 49,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 50,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 51,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 52,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 53,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 54,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 55,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 56,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 57,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 58,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 59,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 60,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 61,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 62,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 63,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 64,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 65,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 66,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 67,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 68,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 69,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 70,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 71,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 72,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 73,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 74,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 75,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 76,
+          "y": 15,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        }
+      ]
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='target2'",
+      "bounds": [90, 60],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "invalidations": [
+        [0, 0, 90, 60]
+      ],
+      "underInvalidations": [
+        {
+          "x": 0,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 1,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 2,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 3,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 4,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 5,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 6,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 7,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 8,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 9,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 10,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 11,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 12,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 13,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 14,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 15,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 16,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 17,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 18,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 19,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 20,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 21,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 22,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 23,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 24,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 25,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 26,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 27,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 28,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 29,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 30,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 31,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 32,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 33,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 34,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 35,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 36,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 37,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 38,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 39,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 40,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 41,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 42,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 43,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 44,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 45,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 46,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 47,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 48,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 49,
+          "y": 0,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        }
+      ],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV",
+      "bounds": [225, 225],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFF00",
+      "invalidations": [
+        [60, 105, 90, 60]
+      ],
+      "underInvalidations": [
+        {
+          "x": 60,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 61,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 62,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 63,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 64,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 65,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 66,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 67,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 68,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 69,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 70,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 71,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 72,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 73,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 74,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 75,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 76,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 77,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 78,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 79,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 80,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 81,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 82,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 83,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 84,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 85,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 86,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 87,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 88,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 89,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 90,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 91,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 92,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 93,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 94,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 95,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 96,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 97,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 98,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 99,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 100,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 101,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 102,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 103,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 104,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 105,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 106,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 107,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 108,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 109,
+          "y": 105,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        }
+      ],
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "bounds": [225, 225],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 3
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "bounds": [203, 203],
+      "drawsContent": false,
+      "transform": 3
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 203],
+      "bounds": [203, 22],
+      "transform": 3
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [203, 0],
+      "bounds": [22, 203],
+      "transform": 3
+    },
+    {
+      "name": "Scroll corner of LayoutNGBlockFlow DIV id='scroller'",
+      "position": [203, 203],
+      "bounds": [22, 22],
+      "contentsOpaque": true,
+      "transform": 3
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "bounds": [6000, 30000],
+      "contentsOpaqueForText": true,
+      "invalidations": [
+        [60, 15015, 90, 60]
+      ],
+      "underInvalidations": [
+        {
+          "x": 60,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 61,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 62,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 63,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 64,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 65,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 66,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 67,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 68,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 69,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 70,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 71,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 72,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 73,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 74,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 75,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 76,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 77,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 78,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 79,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 80,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 81,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 82,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 83,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 84,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 85,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 86,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 87,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 88,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 89,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 90,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 91,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 92,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 93,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 94,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 95,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 96,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 97,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 98,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 99,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 100,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 101,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 102,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 103,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 104,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 105,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 106,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 107,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 108,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        },
+        {
+          "x": 109,
+          "y": 15015,
+          "oldPixel": "#0000FF",
+          "newPixel": "#008000"
+        }
+      ],
+      "transform": 4
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [27, 90, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 165, 0, 1]
+      ]
+    },
+    {
+      "id": 3,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 390, 0, 1]
+      ]
+    },
+    {
+      "id": 4,
+      "parent": 3,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [-75, -14925, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/reflection/reflection-invalidation-after-display-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/reflection/reflection-invalidation-after-display-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/reflection/reflection-invalidation-after-display-expected.txt
new file mode 100644
index 0000000..4123209
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/reflection/reflection-invalidation-after-display-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [450, 12, 675, 300]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/reflection/reflection-invalidation-positioned-child-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/reflection/reflection-invalidation-positioned-child-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/reflection/reflection-invalidation-positioned-child-expected.txt
new file mode 100644
index 0000000..e7f2e2d
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/reflection/reflection-invalidation-positioned-child-expected.txt
@@ -0,0 +1,24 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='box'",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='positioned'",
+      "position": [600, 15],
+      "bounds": [75, 75],
+      "contentsOpaque": true,
+      "backgroundColor": "#0000FF"
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/reflection/reflection-redraw-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/reflection/reflection-redraw-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/reflection/reflection-redraw-expected.txt
new file mode 100644
index 0000000..29edeb3
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/reflection/reflection-redraw-expected.txt
@@ -0,0 +1,17 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [582, 401, 405, 108],
+        [117, 401, 405, 108],
+        [470, 31, 164, 313],
+        [470, 566, 164, 233]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/reflection/reflection-with-rotation-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/reflection/reflection-with-rotation-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/reflection/reflection-with-rotation-expected.png
new file mode 100644
index 0000000..9140f3cf
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/reflection/reflection-with-rotation-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/reflection/reflection-with-rotation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/reflection/reflection-with-rotation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/reflection/reflection-with-rotation-expected.txt
index a116c75..73ae483 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/reflection/reflection-with-rotation-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/reflection/reflection-with-rotation-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/reflection/scroll-absolute-layer-with-reflection-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/reflection/scroll-absolute-layer-with-reflection-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/reflection/scroll-absolute-layer-with-reflection-expected.txt
new file mode 100644
index 0000000..10a49603
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/reflection/scroll-absolute-layer-with-reflection-expected.txt
@@ -0,0 +1,31 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 3024],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [375, 345, 150, 150]
+      ],
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -270, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/reflection/scroll-fixed-layer-with-reflection-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/reflection/scroll-fixed-layer-with-reflection-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/reflection/scroll-fixed-layer-with-reflection-expected.txt
new file mode 100644
index 0000000..18d16958
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/reflection/scroll-fixed-layer-with-reflection-expected.txt
@@ -0,0 +1,46 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 3024],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='moveMe' class='fixed clipped'",
+      "bounds": [150, 150],
+      "contentsOpaqueForText": true,
+      "invalidations": [
+        [0, 0, 150, 150]
+      ],
+      "transform": 2
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -270, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [375, 150, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/reflection/scroll-fixed-reflected-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/reflection/scroll-fixed-reflected-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/reflection/scroll-fixed-reflected-layer-expected.txt
new file mode 100644
index 0000000..67213d1
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/reflection/scroll-fixed-reflected-layer-expected.txt
@@ -0,0 +1,46 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 3024],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='reflected fixed'",
+      "bounds": [150, 150],
+      "contentsOpaqueForText": true,
+      "invalidations": [
+        [0, 0, 150, 150]
+      ],
+      "transform": 2
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -270, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [375, 150, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/remove-block-after-layout-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/remove-block-after-layout-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/remove-block-after-layout-expected.txt
new file mode 100644
index 0000000..36605bc
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/remove-block-after-layout-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 162, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/remove-inline-after-layout-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/remove-inline-after-layout-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/remove-inline-after-layout-expected.txt
new file mode 100644
index 0000000..8bc37d5c
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/remove-inline-after-layout-expected.txt
@@ -0,0 +1,17 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [168, 291, 273, 27],
+        [441, 162, 150, 150],
+        [168, 162, 150, 150],
+        [162, 291, 6, 26]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/remove-inline-layer-after-layout-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/remove-inline-layer-after-layout-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/remove-inline-layer-after-layout-expected.txt
new file mode 100644
index 0000000..8bc37d5c
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/remove-inline-layer-after-layout-expected.txt
@@ -0,0 +1,17 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [168, 291, 273, 27],
+        [441, 162, 150, 150],
+        [168, 162, 150, 150],
+        [162, 291, 6, 26]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/repaint-across-writing-mode-boundary-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/repaint-across-writing-mode-boundary-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/repaint-across-writing-mode-boundary-expected.txt
new file mode 100644
index 0000000..4bcc4d2
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/repaint-across-writing-mode-boundary-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [822, 120, 35, 270]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/repaint-descandant-on-ancestor-layer-move-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/repaint-descandant-on-ancestor-layer-move-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/repaint-descandant-on-ancestor-layer-move-expected.txt
new file mode 100644
index 0000000..728e6c79
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/repaint-descandant-on-ancestor-layer-move-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [642, 57, 450, 27],
+        [42, 57, 450, 27]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/repaint-in-iframe-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/repaint-in-iframe-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/repaint-in-iframe-expected.txt
new file mode 100644
index 0000000..1855870
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/repaint-in-iframe-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [27, 627, 75, 75]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/repaint-on-style-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/repaint-on-style-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/repaint-on-style-change-expected.txt
new file mode 100644
index 0000000..ae5f4be4a
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/repaint-on-style-change-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [390, 390, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/repaint-overlay/layers-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/repaint-overlay/layers-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/repaint-overlay/layers-expected.txt
new file mode 100644
index 0000000..9b512536
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/repaint-overlay/layers-expected.txt
@@ -0,0 +1,107 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 3024],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='container'",
+      "bounds": [150, 150],
+      "contentsOpaqueForText": true,
+      "backgroundColor": "#0000FF80",
+      "invalidations": [
+        [30, 30, 15, 15]
+      ],
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV id='scrollable'",
+      "bounds": [453, 453],
+      "contentsOpaqueForText": true,
+      "transform": 3
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV id='scrollable'",
+      "position": [2, 2],
+      "bounds": [450, 450],
+      "drawsContent": false,
+      "transform": 3
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV id='transform'",
+      "bounds": [300, 300],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFF00",
+      "invalidations": [
+        [30, 30, 15, 15]
+      ],
+      "transform": 6
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -30, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [60, 75, 0, 1]
+      ]
+    },
+    {
+      "id": 3,
+      "parent": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [96, 80, 0, 1]
+      ]
+    },
+    {
+      "id": 4,
+      "parent": 3,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -45, 0, 1]
+      ]
+    },
+    {
+      "id": 5,
+      "parent": 4,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [134, 117, 0, 1]
+      ]
+    },
+    {
+      "id": 6,
+      "parent": 5,
+      "transform": [
+        [3.53553390593274, 3.53553390593274, 0, 0],
+        [-3.53553390593274, 3.53553390593274, 0, 0],
+        [0, 0, 1, 0],
+        [0, 0, 0, 1]
+      ],
+      "origin": [0, 0]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/repaint-subrect-grid-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/repaint-subrect-grid-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/repaint-subrect-grid-expected.txt
index d52bea0..18603bf3 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/repaint-subrect-grid-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/repaint-subrect-grid-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/requestAnimation-translation-leave-traces-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/requestAnimation-translation-leave-traces-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/requestAnimation-translation-leave-traces-expected.txt
new file mode 100644
index 0000000..5862eff
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/requestAnimation-translation-leave-traces-expected.txt
@@ -0,0 +1,24 @@
+This test checks that changing the transform on an element triggers a correct invalidation.
+The paint invalidations below should match the transformed element's coordinates.
+Tested locations: 1200,1500
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [2400, 878],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [1950, 0, 450, 878],
+        [1500, 0, 450, 878],
+        [1350, 0, 150, 150]
+      ]
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 878],
+      "bounds": [1200, 22]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/resize-iframe-text-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/resize-iframe-text-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/resize-iframe-text-expected.txt
new file mode 100644
index 0000000..575a623a7
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/resize-iframe-text-expected.txt
@@ -0,0 +1,23 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [500, 400],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 200, 500, 200]
+      ]
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [478, 0],
+      "bounds": [22, 400]
+    },
+    {
+      "name": "LayoutNGBlockFlow HTML",
+      "bounds": [478, 510]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/ruby-flipped-blocks-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/ruby-flipped-blocks-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/ruby-flipped-blocks-expected.txt
new file mode 100644
index 0000000..350ea3b1
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/ruby-flipped-blocks-expected.txt
@@ -0,0 +1,16 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 42, 30, 30],
+        [12, 12, 30, 30],
+        [42, 50, 15, 15]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/caret-invalidation-in-overflow-scroll-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/caret-invalidation-in-overflow-scroll-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/caret-invalidation-in-overflow-scroll-expected.png
index 4392105ee..6ce2dc6 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/caret-invalidation-in-overflow-scroll-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/caret-invalidation-in-overflow-scroll-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/caret-invalidation-in-overflow-scroll-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/caret-invalidation-in-overflow-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/caret-invalidation-in-overflow-scroll-expected.txt
index 5d94ead4..f909fb9 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/caret-invalidation-in-overflow-scroll-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/caret-invalidation-in-overflow-scroll-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/caret-with-composited-scroll-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/caret-with-composited-scroll-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/caret-with-composited-scroll-expected.png
index f31bf61f1..6ccbf8a 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/caret-with-composited-scroll-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/caret-with-composited-scroll-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/caret-with-composited-scroll-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/caret-with-composited-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/caret-with-composited-scroll-expected.txt
new file mode 100644
index 0000000..8ce5c3e
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/caret-with-composited-scroll-expected.txt
@@ -0,0 +1,54 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "bounds": [150, 150],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "bounds": [150, 150],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "bounds": [308, 1532],
+      "contentsOpaqueForText": true,
+      "invalidations": [
+        [0, 1497, 308, 35]
+      ],
+      "transform": 2
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 66, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -1382, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/composited-add-resizer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/composited-add-resizer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/composited-add-resizer-expected.txt
new file mode 100644
index 0000000..242654c0
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/composited-add-resizer-expected.txt
@@ -0,0 +1,31 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='target'",
+      "bounds": [150, 150],
+      "contentsOpaqueForText": true,
+      "invalidations": [
+        [128, 128, 22, 22]
+      ],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/composited-iframe-scroll-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/composited-iframe-scroll-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/composited-iframe-scroll-repaint-expected.txt
new file mode 100644
index 0000000..54930b00
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/composited-iframe-scroll-repaint-expected.txt
@@ -0,0 +1,56 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [450, 774],
+      "contentsOpaque": true,
+      "backgroundColor": "#EEEEEE",
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow BODY",
+      "bounds": [426, 750],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 3
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [15, 15, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -30, 0, 1]
+      ]
+    },
+    {
+      "id": 3,
+      "parent": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/destroy-composited-scrollbar-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/destroy-composited-scrollbar-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/destroy-composited-scrollbar-expected.txt
new file mode 100644
index 0000000..502a430a
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/destroy-composited-scrollbar-expected.txt
@@ -0,0 +1,32 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV",
+      "bounds": [300, 300],
+      "contentsOpaque": true,
+      "backgroundColor": "#0000FF",
+      "invalidations": [
+        [0, 0, 300, 300]
+      ],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, 150, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/destroy-overlay-scrollbar-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/destroy-overlay-scrollbar-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/destroy-overlay-scrollbar-expected.txt
new file mode 100644
index 0000000..36ece76f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/destroy-overlay-scrollbar-expected.txt
@@ -0,0 +1,11 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/destroy-scrollbar-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/destroy-scrollbar-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/destroy-scrollbar-expected.txt
new file mode 100644
index 0000000..36ece76f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/destroy-scrollbar-expected.txt
@@ -0,0 +1,11 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/document-flipped-blocks-writing-mode-scroll-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/document-flipped-blocks-writing-mode-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/document-flipped-blocks-writing-mode-scroll-expected.txt
new file mode 100644
index 0000000..658ea49d
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/document-flipped-blocks-writing-mode-scroll-expected.txt
@@ -0,0 +1,16 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [2274, 878],
+      "contentsOpaque": true,
+      "backgroundColor": "#ADD8E6"
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 878],
+      "bounds": [1200, 22]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-after-scroll-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-after-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-after-scroll-expected.txt
new file mode 100644
index 0000000..aa1d058
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-after-scroll-expected.txt
@@ -0,0 +1,63 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 3024],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='red fixed'",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#FF0000",
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='t' class='green absolute'",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "invalidations": [
+        [0, 0, 150, 150]
+      ],
+      "transform": 3
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -750, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 300, 0, 1]
+      ]
+    },
+    {
+      "id": 3,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 300, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-and-absolute-position-scrolled-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-and-absolute-position-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-and-absolute-position-scrolled-expected.txt
new file mode 100644
index 0000000..549d088
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-and-absolute-position-scrolled-expected.txt
@@ -0,0 +1,55 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 3024],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='fixed red'",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#FF0000",
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='absoluteDiv' class='absolute green'",
+      "position": [150, 1050],
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "invalidations": [
+        [0, 0, 150, 150]
+      ],
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -750, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [150, 300, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-child-move-after-scroll-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-child-move-after-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-child-move-after-scroll-expected.txt
new file mode 100644
index 0000000..a3273fb
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-child-move-after-scroll-expected.txt
@@ -0,0 +1,47 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 4524],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='toMove'",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "invalidations": [
+        [0, 0, 150, 150]
+      ],
+      "transform": 2
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -300, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [225, 105, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-child-of-fixed-move-after-scroll-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-child-of-fixed-move-after-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-child-of-fixed-move-after-scroll-expected.txt
new file mode 100644
index 0000000..a3273fb
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-child-of-fixed-move-after-scroll-expected.txt
@@ -0,0 +1,47 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 4524],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='toMove'",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "invalidations": [
+        [0, 0, 150, 150]
+      ],
+      "transform": 2
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -300, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [225, 105, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-child-of-transformed-move-after-scroll-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-child-of-transformed-move-after-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-child-of-transformed-move-after-scroll-expected.txt
new file mode 100644
index 0000000..9d4de59
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-child-of-transformed-move-after-scroll-expected.txt
@@ -0,0 +1,32 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 4524],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [237, 417, 150, 150],
+        [27, 417, 150, 150]
+      ],
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -300, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-child-of-transformed-scrolled-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-child-of-transformed-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-child-of-transformed-scrolled-expected.txt
new file mode 100644
index 0000000..e0d2a53
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-child-of-transformed-scrolled-expected.txt
@@ -0,0 +1,66 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='transformed'",
+      "bounds": [428, 428],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 428],
+      "bounds": [428, 22],
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [428, 0],
+      "bounds": [22, 428],
+      "transform": 1
+    },
+    {
+      "name": "Scroll corner of LayoutNGBlockFlow (positioned) DIV id='transformed'",
+      "position": [428, 428],
+      "bounds": [22, 22],
+      "contentsOpaque": true,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='transformed'",
+      "bounds": [1500, 1500],
+      "contentsOpaqueForText": true,
+      "invalidations": [
+        [150, 225, 150, 150]
+      ],
+      "transform": 2
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [150, 75, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -75, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-descendant-of-transformed-scrolled-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-descendant-of-transformed-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-descendant-of-transformed-scrolled-expected.txt
new file mode 100644
index 0000000..5461dc3
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-descendant-of-transformed-scrolled-expected.txt
@@ -0,0 +1,67 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='transformed'",
+      "bounds": [428, 428],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 428],
+      "bounds": [428, 22],
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [428, 0],
+      "bounds": [22, 428],
+      "transform": 1
+    },
+    {
+      "name": "Scroll corner of LayoutNGBlockFlow (positioned) DIV id='transformed'",
+      "position": [428, 428],
+      "bounds": [22, 22],
+      "contentsOpaque": true,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV id='relative'",
+      "position": [75, 75],
+      "bounds": [1500, 1500],
+      "contentsOpaqueForText": true,
+      "invalidations": [
+        [75, 150, 150, 150]
+      ],
+      "transform": 2
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [150, 75, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -75, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-img-src-change-after-scroll-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-img-src-change-after-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-img-src-change-after-scroll-expected.txt
new file mode 100644
index 0000000..f956c57
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-img-src-change-after-scroll-expected.txt
@@ -0,0 +1,43 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 3024],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "transform": 1
+    },
+    {
+      "name": "LayoutImage (positioned) IMG id='img'",
+      "bounds": [150, 150],
+      "contentsOpaqueForText": true,
+      "transform": 2
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -1500, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, 75, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-move-after-scroll-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-move-after-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-move-after-scroll-expected.txt
new file mode 100644
index 0000000..a3273fb
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-move-after-scroll-expected.txt
@@ -0,0 +1,47 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 4524],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='toMove'",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "invalidations": [
+        [0, 0, 150, 150]
+      ],
+      "transform": 2
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -300, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [225, 105, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-scroll-simple-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-scroll-simple-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-scroll-simple-expected.txt
new file mode 100644
index 0000000..0269158
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-scroll-simple-expected.txt
@@ -0,0 +1,44 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 3024],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='green'",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "transform": 2
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -150, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 150, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-scroll-viewport-scroll-hidden-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-scroll-viewport-scroll-hidden-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-scroll-viewport-scroll-hidden-expected.txt
new file mode 100644
index 0000000..58d56eda1
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-scroll-viewport-scroll-hidden-expected.txt
@@ -0,0 +1,39 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 3024],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='fixed green'",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "transform": 2
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -150, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 150, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-under-composited-absolute-scrolled-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-under-composited-absolute-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-under-composited-absolute-scrolled-expected.txt
new file mode 100644
index 0000000..73f9e5c
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-under-composited-absolute-scrolled-expected.txt
@@ -0,0 +1,55 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 3002],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='absolute'",
+      "bounds": [2, 2],
+      "contentsOpaque": true,
+      "backfaceVisibility": "hidden",
+      "backgroundColor": "#FF0000",
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='fixed'",
+      "bounds": [150, 300],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "invalidations": [
+        [0, 150, 150, 150]
+      ]
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -600, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 3000, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-with-border-under-composited-absolute-scrolled-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-with-border-under-composited-absolute-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-with-border-under-composited-absolute-scrolled-expected.txt
new file mode 100644
index 0000000..60c11ae
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/fixed-with-border-under-composited-absolute-scrolled-expected.txt
@@ -0,0 +1,55 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 3002],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='absolute'",
+      "bounds": [2, 2],
+      "contentsOpaque": true,
+      "backfaceVisibility": "hidden",
+      "backgroundColor": "#FF0000",
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='fixed'",
+      "bounds": [180, 330],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "invalidations": [
+        [0, 0, 180, 330]
+      ]
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -600, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 3000, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/flipped-blocks-writing-mode-scroll-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/flipped-blocks-writing-mode-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/flipped-blocks-writing-mode-scroll-expected.txt
new file mode 100644
index 0000000..f6c2c6f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/flipped-blocks-writing-mode-scroll-expected.txt
@@ -0,0 +1,51 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "bounds": [600, 600],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "bounds": [600, 578],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 578],
+      "bounds": [600, 22],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "bounds": [15000, 300],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "invalidations": [
+        [0, 0, 15000, 300]
+      ],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/iframe-gradient-background-scroll-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/iframe-gradient-background-scroll-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/iframe-gradient-background-scroll-repaint-expected.txt
new file mode 100644
index 0000000..5b2950c3
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/iframe-gradient-background-scroll-repaint-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [15, 15, 450, 225]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/iframe-scroll-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/iframe-scroll-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/iframe-scroll-repaint-expected.txt
new file mode 100644
index 0000000..36ece76f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/iframe-scroll-repaint-expected.txt
@@ -0,0 +1,11 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/iframe-scrollbar-hover-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/iframe-scrollbar-hover-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/iframe-scrollbar-hover-expected.txt
new file mode 100644
index 0000000..ac2fe30
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/iframe-scrollbar-hover-expected.txt
@@ -0,0 +1,35 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [278, 0],
+      "bounds": [22, 300],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow HTML",
+      "bounds": [278, 474],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [3, 153, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/inline-style-change-in-scrolled-view-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/inline-style-change-in-scrolled-view-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/inline-style-change-in-scrolled-view-expected.txt
new file mode 100644
index 0000000..8acbd8a
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/inline-style-change-in-scrolled-view-expected.txt
@@ -0,0 +1,42 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [3000, 3000],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 432, 631, 26]
+      ],
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 878],
+      "bounds": [1178, 22]
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 878]
+    },
+    {
+      "name": "Scroll corner of LayoutView #document",
+      "position": [1178, 878],
+      "bounds": [22, 22],
+      "contentsOpaque": true
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [-300, -300, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/invalidate-after-composited-scroll-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/invalidate-after-composited-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/invalidate-after-composited-scroll-expected.txt
new file mode 100644
index 0000000..24722c87
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/invalidate-after-composited-scroll-expected.txt
@@ -0,0 +1,60 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='scroller'",
+      "bounds": [300, 300],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='scroller'",
+      "bounds": [278, 300],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [278, 0],
+      "bounds": [22, 300],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='scroller'",
+      "bounds": [278, 7350],
+      "contentsOpaqueForText": true,
+      "invalidations": [
+        [0, 3600, 150, 150]
+      ],
+      "transform": 2
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [450, 450, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -3525, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/invalidate-after-composited-scroll-of-window-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/invalidate-after-composited-scroll-of-window-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/invalidate-after-composited-scroll-of-window-expected.txt
new file mode 100644
index 0000000..1494cfa9
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/invalidate-after-composited-scroll-of-window-expected.txt
@@ -0,0 +1,32 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 7401],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 7362, 843, 27],
+        [12, 3612, 150, 150]
+      ],
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -3525, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/invalidate-caret-in-composited-scrolling-container-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/invalidate-caret-in-composited-scrolling-container-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/invalidate-caret-in-composited-scrolling-container-expected.txt
new file mode 100644
index 0000000..0aa095d
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/invalidate-caret-in-composited-scrolling-container-expected.txt
@@ -0,0 +1,33 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGTextControlSingleLine INPUT id='root'",
+      "position": [-3, -3],
+      "bounds": [101, 38],
+      "contentsOpaqueForText": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 101, 38]
+      ],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/invalidate-caret-in-non-composited-scrolling-container-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/invalidate-caret-in-non-composited-scrolling-container-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/invalidate-caret-in-non-composited-scrolling-container-expected.txt
new file mode 100644
index 0000000..0aa095d
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/invalidate-caret-in-non-composited-scrolling-container-expected.txt
@@ -0,0 +1,33 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGTextControlSingleLine INPUT id='root'",
+      "position": [-3, -3],
+      "bounds": [101, 38],
+      "contentsOpaqueForText": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 101, 38]
+      ],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/layout-state-scrolloffset-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/layout-state-scrolloffset-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/layout-state-scrolloffset-expected.txt
new file mode 100644
index 0000000..6895bb6
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/layout-state-scrolloffset-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [150, 177, 62, 26]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/layout-state-scrolloffset2-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/layout-state-scrolloffset2-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/layout-state-scrolloffset2-expected.txt
new file mode 100644
index 0000000..452e8c5
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/layout-state-scrolloffset2-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [153, 180, 63, 27]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/layout-state-scrolloffset3-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/layout-state-scrolloffset3-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/layout-state-scrolloffset3-expected.txt
new file mode 100644
index 0000000..7ee558a1
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/layout-state-scrolloffset3-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [150, 177, 51, 26]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/line-in-scrolled-clipped-block-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/line-in-scrolled-clipped-block-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/line-in-scrolled-clipped-block-expected.txt
new file mode 100644
index 0000000..d6bf520
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/line-in-scrolled-clipped-block-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 150, 26]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/nested-fixed-iframe-scrolled-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/nested-fixed-iframe-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/nested-fixed-iframe-scrolled-expected.txt
new file mode 100644
index 0000000..54496747c
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/nested-fixed-iframe-scrolled-expected.txt
@@ -0,0 +1,31 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 3024],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [33, 783, 150, 150]
+      ],
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -600, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/outline-change-in-scrollers-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/outline-change-in-scrollers-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/outline-change-in-scrollers-expected.txt
new file mode 100644
index 0000000..e0116548
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/outline-change-in-scrollers-expected.txt
@@ -0,0 +1,219 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='scroll'",
+      "position": [15, 15],
+      "bounds": [143, 143],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [15, 158],
+      "bounds": [143, 22],
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [158, 15],
+      "bounds": [22, 143],
+      "transform": 1
+    },
+    {
+      "name": "Scroll corner of LayoutNGBlockFlow (relative positioned) DIV class='scroll'",
+      "position": [170, 12],
+      "bounds": [439, 195],
+      "contentsOpaqueForText": true
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='scroll'",
+      "position": [15, 15],
+      "bounds": [225, 225],
+      "contentsOpaqueForText": true,
+      "invalidations": [
+        [0, 0, 113, 113]
+      ],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='scroll'",
+      "position": [15, 15],
+      "bounds": [143, 143],
+      "drawsContent": false,
+      "transform": 2
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [213, 170],
+      "bounds": [195, 238],
+      "contentsOpaqueForText": true,
+      "invalidations": [
+        [46, 89, 112, 112]
+      ]
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [158, 15],
+      "bounds": [22, 143],
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='scroll'",
+      "position": [15, 15],
+      "bounds": [143, 225],
+      "contentsOpaqueForText": true,
+      "invalidations": [
+        [31, 0, 112, 113]
+      ],
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='scroll'",
+      "position": [15, 15],
+      "bounds": [143, 143],
+      "drawsContent": false,
+      "transform": 3
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [15, 158],
+      "bounds": [143, 22],
+      "transform": 3
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [158, 15],
+      "bounds": [22, 143],
+      "transform": 3
+    },
+    {
+      "name": "Scroll corner of LayoutNGBlockFlow (relative positioned) DIV class='scroll'",
+      "position": [414, 170],
+      "bounds": [195, 238],
+      "contentsOpaqueForText": true
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='scroll'",
+      "position": [15, 15],
+      "bounds": [225, 225],
+      "contentsOpaqueForText": true,
+      "invalidations": [
+        [0, 0, 113, 113]
+      ],
+      "transform": 3
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='scroll'",
+      "position": [37, 15],
+      "bounds": [143, 143],
+      "drawsContent": false,
+      "transform": 4
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [27, 371],
+      "bounds": [366, 22],
+      "contentsOpaqueForText": true
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [15, 15],
+      "bounds": [22, 143],
+      "transform": 4
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='scroll'",
+      "position": [37, 15],
+      "bounds": [143, 225],
+      "contentsOpaqueForText": true,
+      "invalidations": [
+        [31, 0, 112, 113]
+      ],
+      "transform": 4
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='scroll'",
+      "position": [15, 15],
+      "bounds": [143, 143],
+      "drawsContent": false,
+      "transform": 5
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [15, 158],
+      "bounds": [143, 22],
+      "transform": 5
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [158, 15],
+      "bounds": [22, 165],
+      "contentsOpaqueForText": true,
+      "transform": 5
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='scroll'",
+      "position": [15, 15],
+      "bounds": [225, 143],
+      "contentsOpaqueForText": true,
+      "invalidations": [
+        [0, 31, 113, 112]
+      ],
+      "transform": 5
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [213, 12, 0, 1]
+      ]
+    },
+    {
+      "id": 3,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [414, 12, 0, 1]
+      ]
+    },
+    {
+      "id": 4,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 213, 0, 1]
+      ]
+    },
+    {
+      "id": 5,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [414, 213, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/outline-change-scrollable-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/outline-change-scrollable-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/outline-change-scrollable-expected.txt
new file mode 100644
index 0000000..417a7b9fa
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/outline-change-scrollable-expected.txt
@@ -0,0 +1,19 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1512, 878],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 1512, 192]
+      ]
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 878],
+      "bounds": [1200, 22]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/overflow-auto-in-overflow-auto-scrolled-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/overflow-auto-in-overflow-auto-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/overflow-auto-in-overflow-auto-scrolled-expected.txt
new file mode 100644
index 0000000..561098f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/overflow-auto-in-overflow-auto-scrolled-expected.txt
@@ -0,0 +1,89 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='outerDiv'",
+      "bounds": [1154, 450],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1154, 0],
+      "bounds": [22, 450],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='outerDiv'",
+      "bounds": [1154, 1050],
+      "contentsOpaqueForText": true,
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='innerDiv'",
+      "bounds": [1132, 600],
+      "drawsContent": false,
+      "transform": 3
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1132, 0],
+      "bounds": [22, 600],
+      "transform": 3
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='innerDiv'",
+      "bounds": [450, 1200],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "transform": 4
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -450, 0, 1]
+      ]
+    },
+    {
+      "id": 3,
+      "parent": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, 450, 0, 1]
+      ]
+    },
+    {
+      "id": 4,
+      "parent": 3,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -600, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/overflow-hidden-in-overflow-hidden-scrolled-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/overflow-hidden-in-overflow-hidden-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/overflow-hidden-in-overflow-hidden-scrolled-expected.txt
new file mode 100644
index 0000000..c339e4ca4
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/overflow-hidden-in-overflow-hidden-scrolled-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 27, 150, 285]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/overflow-hidden-yet-scrolled-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/overflow-hidden-yet-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/overflow-hidden-yet-scrolled-expected.txt
index 0be3211..3921d09b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/overflow-hidden-yet-scrolled-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/overflow-hidden-yet-scrolled-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,6 +9,7 @@
     {
       "name": "LayoutNGBlockFlow DIV id='scroller'",
       "bounds": [453, 453],
+      "contentsOpaqueForText": true,
       "backfaceVisibility": "hidden",
       "invalidations": [
         [2, 302, 150, 150]

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/overflow-hidden-yet-scrolled-with-custom-scrollbar-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/overflow-hidden-yet-scrolled-with-custom-scrollbar-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/overflow-hidden-yet-scrolled-with-custom-scrollbar-expected.txt
index 0be3211..3921d09b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/overflow-hidden-yet-scrolled-with-custom-scrollbar-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/overflow-hidden-yet-scrolled-with-custom-scrollbar-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -9,6 +9,7 @@
     {
       "name": "LayoutNGBlockFlow DIV id='scroller'",
       "bounds": [453, 453],
+      "contentsOpaqueForText": true,
       "backfaceVisibility": "hidden",
       "invalidations": [
         [2, 302, 150, 150]

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/overflow-move-after-scroll-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/overflow-move-after-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/overflow-move-after-scroll-expected.txt
new file mode 100644
index 0000000..b70aa80
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/overflow-move-after-scroll-expected.txt
@@ -0,0 +1,68 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='scroller' class='scroller'",
+      "bounds": [1050, 600],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='scroller' class='scroller'",
+      "bounds": [1028, 578],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 578],
+      "bounds": [1050, 22],
+      "contentsOpaqueForText": true,
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1028, 0],
+      "bounds": [22, 578],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='scroller' class='scroller'",
+      "bounds": [1028, 900],
+      "contentsOpaqueForText": true,
+      "invalidations": [
+        [450, 300, 180, 75],
+        [75, 300, 180, 75]
+      ],
+      "transform": 2
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [15, 90, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -150, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/overflow-scroll-after-move-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/overflow-scroll-after-move-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/overflow-scroll-after-move-expected.txt
new file mode 100644
index 0000000..2d40e2a
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/overflow-scroll-after-move-expected.txt
@@ -0,0 +1,68 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='scroller'",
+      "bounds": [450, 600],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='scroller'",
+      "bounds": [428, 578],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 578],
+      "bounds": [450, 22],
+      "contentsOpaqueForText": true,
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [428, 0],
+      "bounds": [22, 578],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='scroller'",
+      "bounds": [428, 1350],
+      "contentsOpaqueForText": true,
+      "invalidations": [
+        [75, 465, 300, 75],
+        [75, 300, 300, 75]
+      ],
+      "transform": 2
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [15, 90, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -225, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/overflow-scroll-body-appear-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/overflow-scroll-body-appear-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/overflow-scroll-body-appear-expected.txt
new file mode 100644
index 0000000..6c222c6
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/overflow-scroll-body-appear-expected.txt
@@ -0,0 +1,33 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [3012, 3138],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 3012, 3138]
+      ]
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 878],
+      "bounds": [1178, 22]
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 878]
+    },
+    {
+      "name": "Scroll corner of LayoutView #document",
+      "position": [1178, 878],
+      "bounds": [22, 22],
+      "contentsOpaque": true,
+      "invalidations": [
+        [0, 0, 22, 22]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/overflow-scroll-composited-non-stacking-child-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/overflow-scroll-composited-non-stacking-child-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/overflow-scroll-composited-non-stacking-child-expected.txt
new file mode 100644
index 0000000..46864e3
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/overflow-scroll-composited-non-stacking-child-expected.txt
@@ -0,0 +1,90 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='back'",
+      "position": [113, 98],
+      "bounds": [270, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#CCDDCC",
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow HTML",
+      "position": [12, 90],
+      "bounds": [1176, 300],
+      "contentsOpaqueForText": true
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV class='scroller'",
+      "position": [8, 8],
+      "bounds": [428, 263],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [7, 270],
+      "bounds": [450, 23],
+      "contentsOpaqueForText": true,
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [436, 7],
+      "bounds": [22, 263],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='icon'",
+      "bounds": [60, 60],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFDDBB",
+      "transform": 3
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='list'",
+      "position": [38, 38],
+      "bounds": [270, 375],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 2
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [27, 90, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -75, 0, 1]
+      ]
+    },
+    {
+      "id": 3,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [300, 15, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/overflow-scroll-delete-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/overflow-scroll-delete-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/overflow-scroll-delete-expected.txt
new file mode 100644
index 0000000..e3781ed
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/overflow-scroll-delete-expected.txt
@@ -0,0 +1,53 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='t'",
+      "bounds": [98, 104],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [98, 0],
+      "bounds": [22, 104],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='t'",
+      "position": [0, 243],
+      "bounds": [65, 54],
+      "invalidations": [
+        [0, 0, 65, 53]
+      ],
+      "transform": 2
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 117, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -192, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/overflow-scroll-in-overflow-scroll-scrolled-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/overflow-scroll-in-overflow-scroll-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/overflow-scroll-in-overflow-scroll-scrolled-expected.txt
new file mode 100644
index 0000000..561098f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/overflow-scroll-in-overflow-scroll-scrolled-expected.txt
@@ -0,0 +1,89 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='outerDiv'",
+      "bounds": [1154, 450],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1154, 0],
+      "bounds": [22, 450],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='outerDiv'",
+      "bounds": [1154, 1050],
+      "contentsOpaqueForText": true,
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='innerDiv'",
+      "bounds": [1132, 600],
+      "drawsContent": false,
+      "transform": 3
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1132, 0],
+      "bounds": [22, 600],
+      "transform": 3
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='innerDiv'",
+      "bounds": [450, 1200],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "transform": 4
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -450, 0, 1]
+      ]
+    },
+    {
+      "id": 3,
+      "parent": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, 450, 0, 1]
+      ]
+    },
+    {
+      "id": 4,
+      "parent": 3,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -600, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/overflow-scroll-local-background-text-color-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/overflow-scroll-local-background-text-color-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/overflow-scroll-local-background-text-color-change-expected.txt
new file mode 100644
index 0000000..f81cc146
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/overflow-scroll-local-background-text-color-change-expected.txt
@@ -0,0 +1,71 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "bounds": [300, 300],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "bounds": [278, 278],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "bounds": [278, 825],
+      "contentsOpaque": true,
+      "backgroundColor": "#0000FF",
+      "invalidations": [
+        [0, 0, 278, 825]
+      ],
+      "transform": 2
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 278],
+      "bounds": [300, 22],
+      "contentsOpaqueForText": true,
+      "invalidations": [
+        [0, 0, 278, 22]
+      ],
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [278, 0],
+      "bounds": [22, 278],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -547, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/repaint-composited-child-in-scrolled-container-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/repaint-composited-child-in-scrolled-container-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/repaint-composited-child-in-scrolled-container-expected.txt
new file mode 100644
index 0000000..99daf91
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/repaint-composited-child-in-scrolled-container-expected.txt
@@ -0,0 +1,84 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='outer'",
+      "bounds": [428, 428],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='outer'",
+      "bounds": [975, 900],
+      "contentsOpaqueForText": true,
+      "backgroundColor": "#0000FF80",
+      "transform": 2
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 428],
+      "bounds": [428, 22],
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [428, 0],
+      "bounds": [22, 428],
+      "transform": 1
+    },
+    {
+      "name": "Scroll corner of LayoutNGBlockFlow (positioned) DIV id='outer'",
+      "position": [428, 428],
+      "bounds": [22, 22],
+      "contentsOpaque": true,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='container'",
+      "bounds": [900, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FF0000",
+      "invalidations": [
+        [0, 0, 900, 900]
+      ],
+      "transform": 3
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [-547, 0, 0, 1]
+      ]
+    },
+    {
+      "id": 3,
+      "parent": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [75, 0, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/repaint-during-scroll-with-zoom-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/repaint-during-scroll-with-zoom-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/repaint-during-scroll-with-zoom-expected.txt
new file mode 100644
index 0000000..96da5318
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/repaint-during-scroll-with-zoom-expected.txt
@@ -0,0 +1,58 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#C0C0C0"
+    },
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [3012, 3024],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "transform": 2
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 353],
+      "bounds": [353, 22],
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [353, 0],
+      "bounds": [22, 353],
+      "transform": 1
+    },
+    {
+      "name": "Scroll corner of LayoutView #document",
+      "position": [353, 353],
+      "bounds": [22, 22],
+      "contentsOpaque": true,
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [4, 98, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [-15, -15, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/resize-scrollable-div-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/resize-scrollable-div-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/resize-scrollable-div-expected.txt
new file mode 100644
index 0000000..14dbebc
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/resize-scrollable-div-expected.txt
@@ -0,0 +1,19 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 590, 428, 22],
+        [12, 290, 128, 22],
+        [440, 162, 22, 428],
+        [140, 162, 22, 128],
+        [440, 590, 22, 22],
+        [140, 290, 22, 22]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/resize-scrollable-iframe-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/resize-scrollable-iframe-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/resize-scrollable-iframe-expected.txt
new file mode 100644
index 0000000..6974a63
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/resize-scrollable-iframe-expected.txt
@@ -0,0 +1,51 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 428],
+      "bounds": [428, 22],
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [428, 0],
+      "bounds": [22, 428],
+      "transform": 1
+    },
+    {
+      "name": "Scroll corner of LayoutView #document",
+      "position": [428, 428],
+      "bounds": [22, 22],
+      "contentsOpaque": true,
+      "invalidations": [
+        [0, 0, 22, 22]
+      ],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow HTML",
+      "bounds": [1512, 1524],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 162, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scroll-descendant-with-cached-cliprects-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scroll-descendant-with-cached-cliprects-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scroll-descendant-with-cached-cliprects-expected.txt
new file mode 100644
index 0000000..ea3eb20
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scroll-descendant-with-cached-cliprects-expected.txt
@@ -0,0 +1,50 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 2840],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [1016, 75, 150, 150]
+      ],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='scrollpanel'",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#FF0000",
+      "invalidations": [
+        [0, 0, 150, 150]
+      ],
+      "transform": 2
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -300, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [1016, 75, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scroll-fixed-layer-with-no-visible-content-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scroll-fixed-layer-with-no-visible-content-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scroll-fixed-layer-with-no-visible-content-expected.txt
new file mode 100644
index 0000000..75e5e27
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scroll-fixed-layer-with-no-visible-content-expected.txt
@@ -0,0 +1,47 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 3024],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='moveMe' class='fixed clipped'",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "invalidations": [
+        [0, 0, 150, 150]
+      ],
+      "transform": 2
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -1500, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [150, 225, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scroll-fixed-layer-with-transformed-parent-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scroll-fixed-layer-with-transformed-parent-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scroll-fixed-layer-with-transformed-parent-layer-expected.txt
new file mode 100644
index 0000000..c5932e0
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scroll-fixed-layer-with-transformed-parent-layer-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [140, 352, 213, 213]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scroll-in-clipped-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scroll-in-clipped-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scroll-in-clipped-layer-expected.txt
new file mode 100644
index 0000000..a3803d4
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scroll-in-clipped-layer-expected.txt
@@ -0,0 +1,19 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 3024],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [150, 225, 150, 150]
+      ]
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scroll-in-fixed-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scroll-in-fixed-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scroll-in-fixed-layer-expected.txt
new file mode 100644
index 0000000..75e5e27
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scroll-in-fixed-layer-expected.txt
@@ -0,0 +1,47 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 3024],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='moveMe' class='fixed clipped'",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "invalidations": [
+        [0, 0, 150, 150]
+      ],
+      "transform": 2
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -1500, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [150, 225, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scroll-in-transformed-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scroll-in-transformed-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scroll-in-transformed-layer-expected.txt
new file mode 100644
index 0000000..384551b
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scroll-in-transformed-layer-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [118, 193, 214, 214]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scroll-stacking-context-backface-visiblity-leaves-traces-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scroll-stacking-context-backface-visiblity-leaves-traces-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scroll-stacking-context-backface-visiblity-leaves-traces-expected.txt
new file mode 100644
index 0000000..8628f49
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scroll-stacking-context-backface-visiblity-leaves-traces-expected.txt
@@ -0,0 +1,62 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 7581],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) HEADER",
+      "bounds": [1154, 30],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "backfaceVisibility": "hidden",
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='searchbar'",
+      "bounds": [225, 225],
+      "contentsOpaque": true,
+      "backgroundColor": "#800080",
+      "transform": 3
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -2100, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 39, 0, 1]
+      ]
+    },
+    {
+      "id": 3,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [27, 675, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scroll-with-transformed-parent-layer-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scroll-with-transformed-parent-layer-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scroll-with-transformed-parent-layer-expected.png
new file mode 100644
index 0000000..3f372f4d
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scroll-with-transformed-parent-layer-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scroll-with-transformed-parent-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scroll-with-transformed-parent-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scroll-with-transformed-parent-layer-expected.txt
new file mode 100644
index 0000000..384551b
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scroll-with-transformed-parent-layer-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [118, 193, 214, 214]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scrollbar-ancestor-clip-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scrollbar-ancestor-clip-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scrollbar-ancestor-clip-change-expected.txt
new file mode 100644
index 0000000..d3d8ab7f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scrollbar-ancestor-clip-change-expected.txt
@@ -0,0 +1,57 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='target'",
+      "bounds": [128, 278],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 278],
+      "bounds": [128, 22],
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [128, 0],
+      "bounds": [22, 278],
+      "transform": 1
+    },
+    {
+      "name": "Scroll corner of LayoutNGBlockFlow DIV id='target'",
+      "position": [128, 278],
+      "bounds": [22, 22],
+      "contentsOpaque": true,
+      "invalidations": [
+        [0, 0, 22, 22]
+      ],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='target'",
+      "bounds": [600, 600],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scrollbar-invalidation-on-resize-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scrollbar-invalidation-on-resize-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scrollbar-invalidation-on-resize-expected.txt
new file mode 100644
index 0000000..7938bbd
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scrollbar-invalidation-on-resize-expected.txt
@@ -0,0 +1,17 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 203, 428, 22],
+        [440, 75, 22, 128],
+        [140, 75, 22, 128],
+        [440, 203, 22, 22]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scrollbar-invalidation-on-resize-with-border-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scrollbar-invalidation-on-resize-with-border-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scrollbar-invalidation-on-resize-with-border-expected.txt
new file mode 100644
index 0000000..911c78f6
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scrollbar-invalidation-on-resize-with-border-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 75, 480, 180]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scrollbar-parts-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scrollbar-parts-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scrollbar-parts-expected.txt
new file mode 100644
index 0000000..10e20f1
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scrollbar-parts-expected.txt
@@ -0,0 +1,54 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV",
+      "bounds": [128, 128],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 128],
+      "bounds": [128, 22],
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [128, 0],
+      "bounds": [22, 128],
+      "transform": 1
+    },
+    {
+      "name": "Scroll corner of LayoutNGBlockFlow DIV",
+      "position": [128, 128],
+      "bounds": [22, 22],
+      "contentsOpaque": true,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV",
+      "bounds": [225, 450],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scrolled-iframe-scrollbar-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scrolled-iframe-scrollbar-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scrolled-iframe-scrollbar-change-expected.txt
new file mode 100644
index 0000000..7baba3a
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/scrolled-iframe-scrollbar-change-expected.txt
@@ -0,0 +1,35 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1206, 906],
+      "contentsOpaque": true,
+      "backgroundColor": "#FF0000",
+      "invalidations": [
+        [15, 3, 1176, 888]
+      ]
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='overlay'",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "invalidations": [
+        [0, 0, 1200, 900]
+      ],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [3, 3, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/sticky/invalidate-after-composited-scroll-with-sticky-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/sticky/invalidate-after-composited-scroll-with-sticky-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/sticky/invalidate-after-composited-scroll-with-sticky-expected.txt
index 4bdca2fd3..92739f6 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/sticky/invalidate-after-composited-scroll-with-sticky-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/scroll/sticky/invalidate-after-composited-scroll-with-sticky-expected.txt
@@ -1,25 +1,29 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 984],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow MAT id='scroller'",
-      "bounds": [540, 960],
+      "bounds": [518, 960],
+      "drawsContent": false,
       "transform": 2
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [518, 0],
       "bounds": [22, 960],
       "transform": 2
     },
     {
-      "name": "Scrolling Contents Layer",
-      "bounds": [518, 3027],
+      "name": "LayoutNGBlockFlow MAT id='scroller'",
+      "position": [0, 27],
+      "bounds": [518, 3000],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
       "transform": 3
     },
     {
@@ -28,10 +32,9 @@
       "transform": 4
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/search-field-cancel-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/search-field-cancel-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/search-field-cancel-expected.txt
new file mode 100644
index 0000000..cbb9ba8
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/search-field-cancel-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [18, 68, 88, 22]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/invalidation-rect-includes-newline-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/invalidation-rect-includes-newline-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/invalidation-rect-includes-newline-expected.txt
new file mode 100644
index 0000000..67b81a5
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/invalidation-rect-includes-newline-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 72, 48]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/invalidation-rect-includes-newline-for-rtl-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/invalidation-rect-includes-newline-for-rtl-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/invalidation-rect-includes-newline-for-rtl-expected.txt
new file mode 100644
index 0000000..8a111a8
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/invalidation-rect-includes-newline-for-rtl-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 12, 60, 48]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-lr-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-lr-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-lr-expected.txt
new file mode 100644
index 0000000..1d61b8b
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-lr-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 48, 72]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-rl-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-rl-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-rl-expected.txt
new file mode 100644
index 0000000..1d61b8b
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-rl-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 48, 72]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/invalidation-rect-with-br-includes-newline-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/invalidation-rect-with-br-includes-newline-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/invalidation-rect-with-br-includes-newline-expected.txt
new file mode 100644
index 0000000..6a1d5db
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/invalidation-rect-with-br-includes-newline-expected.txt
@@ -0,0 +1,16 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [36, 12, 24, 24],
+        [12, 36, 24, 24],
+        [12, 12, 24, 24]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/japanese-rl-selection-clear-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/japanese-rl-selection-clear-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/japanese-rl-selection-clear-expected.txt
new file mode 100644
index 0000000..6a1d5c2
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/japanese-rl-selection-clear-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [465, 185, 695, 584],
+        [554, 185, 612, 592]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/repaint-rect-for-vertical-writing-mode-with-positioned-root-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/repaint-rect-for-vertical-writing-mode-with-positioned-root-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/repaint-rect-for-vertical-writing-mode-with-positioned-root-expected.txt
new file mode 100644
index 0000000..ba5394c
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/repaint-rect-for-vertical-writing-mode-with-positioned-root-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [274, 302, 28, 263]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selected-replaced-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selected-replaced-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selected-replaced-expected.txt
new file mode 100644
index 0000000..cec67a85
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selected-replaced-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 222, 321, 348],
+        [12, 102, 321, 348]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-after-delete-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-after-delete-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-after-delete-expected.txt
new file mode 100644
index 0000000..fe3a7a3
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-after-delete-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [57, 111, 228, 165]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-after-remove-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-after-remove-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-after-remove-expected.txt
new file mode 100644
index 0000000..fe3a7a3
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-after-remove-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [57, 111, 228, 165]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-change-in-iframe-with-relative-parent-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-change-in-iframe-with-relative-parent-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-change-in-iframe-with-relative-parent-expected.txt
new file mode 100644
index 0000000..5be0592
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-change-in-iframe-with-relative-parent-expected.txt
@@ -0,0 +1,21 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [27, 357, 60, 15],
+        [27, 327, 45, 15],
+        [27, 297, 45, 15],
+        [87, 357, 15, 15],
+        [72, 327, 15, 15],
+        [72, 297, 15, 15],
+        [27, 342, 15, 15],
+        [27, 312, 15, 15]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-clear-after-move-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-clear-after-move-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-clear-after-move-expected.txt
new file mode 100644
index 0000000..7c8885f7
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-clear-after-move-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [150, 450, 75, 76]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-clear-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-clear-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-clear-expected.txt
new file mode 100644
index 0000000..5c3a944
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-clear-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 162, 150, 150],
+        [12, 12, 147, 300]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-in-composited-scrolling-container-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-in-composited-scrolling-container-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-in-composited-scrolling-container-expected.png
index eb2c896..b73ca94 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-in-composited-scrolling-container-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-in-composited-scrolling-container-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-in-composited-scrolling-container-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-in-composited-scrolling-container-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-in-composited-scrolling-container-expected.txt
new file mode 100644
index 0000000..ad79bb8
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-in-composited-scrolling-container-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [9, 9, 101, 38]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.png
index 6d361e9..f73297ce 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.txt
new file mode 100644
index 0000000..ad79bb8
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [9, 9, 101, 38]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-partial-invalidation-between-blocks-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-partial-invalidation-between-blocks-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-partial-invalidation-between-blocks-expected.txt
new file mode 100644
index 0000000..253fa63
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-partial-invalidation-between-blocks-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [16, 50, 114, 27],
+        [16, 17, 93, 27]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-rl-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-rl-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-rl-expected.txt
new file mode 100644
index 0000000..d251b90
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-rl-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [1161, 12, 27, 223]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-within-composited-scroller-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-within-composited-scroller-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-within-composited-scroller-expected.txt
new file mode 100644
index 0000000..d0e0039d
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/selection-within-composited-scroller-expected.txt
@@ -0,0 +1,74 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "bounds": [300, 300],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "bounds": [278, 278],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='scroller'",
+      "bounds": [300, 2430],
+      "contentsOpaque": true,
+      "backgroundColor": "#ADD8E6",
+      "invalidations": [
+        [0, 915, 34, 27]
+      ],
+      "transform": 2
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 278],
+      "bounds": [278, 22],
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [278, 0],
+      "bounds": [22, 278],
+      "transform": 1
+    },
+    {
+      "name": "Scroll corner of LayoutNGBlockFlow DIV id='scroller'",
+      "position": [278, 278],
+      "bounds": [22, 22],
+      "contentsOpaque": true,
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -675, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/text-selection-rect-in-overflow-2-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/text-selection-rect-in-overflow-2-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/text-selection-rect-in-overflow-2-expected.txt
new file mode 100644
index 0000000..aba671f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/text-selection-rect-in-overflow-2-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [27, 42, 358, 27]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/text-selection-rect-in-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/text-selection-rect-in-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/text-selection-rect-in-overflow-expected.txt
new file mode 100644
index 0000000..c8ed95f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/selection/text-selection-rect-in-overflow-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 27, 300, 27]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/set-text-content-same-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/set-text-content-same-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/set-text-content-same-expected.txt
new file mode 100644
index 0000000..36ece76f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/set-text-content-same-expected.txt
@@ -0,0 +1,11 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/stacked-diacritics-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/stacked-diacritics-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/stacked-diacritics-expected.txt
new file mode 100644
index 0000000..8cec328
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/stacked-diacritics-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [28, 240, 196, 60]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/subtree-root-skipped-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/subtree-root-skipped-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/subtree-root-skipped-expected.png
index bc963689..2bf354d 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/subtree-root-skipped-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/subtree-root-skipped-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/subtree-root-skipped-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/subtree-root-skipped-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/subtree-root-skipped-expected.txt
new file mode 100644
index 0000000..8f5b919
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/subtree-root-skipped-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [18, 17, 51, 22],
+        [12, 432, 15, 30]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/absolute-sized-document-no-scrollbars-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/absolute-sized-document-no-scrollbars-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/absolute-sized-document-no-scrollbars-expected.txt
new file mode 100644
index 0000000..d5c7d6a
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/absolute-sized-document-no-scrollbars-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 1200, 900]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/add-background-property-on-root-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/add-background-property-on-root-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/add-background-property-on-root-expected.txt
new file mode 100644
index 0000000..72edcfd
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/add-background-property-on-root-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/add-border-property-on-root-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/add-border-property-on-root-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/add-border-property-on-root-expected.txt
new file mode 100644
index 0000000..21553b1
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/add-border-property-on-root-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 180, 180]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/add-outline-property-on-root-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/add-outline-property-on-root-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/add-outline-property-on-root-expected.txt
new file mode 100644
index 0000000..e1ca6ee
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/add-outline-property-on-root-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 177, 177]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/animate-fill-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/animate-fill-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/animate-fill-expected.txt
new file mode 100644
index 0000000..7068f8f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/animate-fill-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/animate-target-id-changed-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/animate-target-id-changed-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/animate-target-id-changed-expected.txt
new file mode 100644
index 0000000..7068f8f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/animate-target-id-changed-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/animate-viewport-overflow-2-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/animate-viewport-overflow-2-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/animate-viewport-overflow-2-expected.txt
new file mode 100644
index 0000000..5e9dfd1
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/animate-viewport-overflow-2-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 312, 150, 150],
+        [12, 237, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/animate-viewport-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/animate-viewport-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/animate-viewport-overflow-expected.txt
new file mode 100644
index 0000000..c8e79ff7
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/animate-viewport-overflow-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 312, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/animated-path-inside-transformed-html-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/animated-path-inside-transformed-html-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/animated-path-inside-transformed-html-expected.png
index 7dc489cf..0281dc5 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/animated-path-inside-transformed-html-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/animated-path-inside-transformed-html-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/animated-path-inside-transformed-html-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/animated-path-inside-transformed-html-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/animated-path-inside-transformed-html-expected.txt
new file mode 100644
index 0000000..3f892f21
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/animated-path-inside-transformed-html-expected.txt
@@ -0,0 +1,19 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [370, 132, 182, 65],
+        [305, 501, 182, 65],
+        [533, 185, 155, 156],
+        [164, 125, 155, 151],
+        [529, 594, 147, 147],
+        [135, 309, 147, 147]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/animated-svg-as-image-background-offscreen-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/animated-svg-as-image-background-offscreen-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/animated-svg-as-image-background-offscreen-expected.txt
new file mode 100644
index 0000000..df75667d
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/animated-svg-as-image-background-offscreen-expected.txt
@@ -0,0 +1,39 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [3012, 3024],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 878],
+      "bounds": [1178, 22]
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 878]
+    },
+    {
+      "name": "Scroll corner of LayoutView #document",
+      "position": [1178, 878],
+      "bounds": [22, 22],
+      "contentsOpaque": true
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -1500, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/animated-svg-as-image-offscreen-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/animated-svg-as-image-offscreen-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/animated-svg-as-image-offscreen-expected.txt
new file mode 100644
index 0000000..df75667d
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/animated-svg-as-image-offscreen-expected.txt
@@ -0,0 +1,39 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [3012, 3024],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 878],
+      "bounds": [1178, 22]
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 878]
+    },
+    {
+      "name": "Scroll corner of LayoutView #document",
+      "position": [1178, 878],
+      "bounds": [22, 22],
+      "contentsOpaque": true
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -1500, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/animated-svg-as-image-transformed-offscreen-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/animated-svg-as-image-transformed-offscreen-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/animated-svg-as-image-transformed-offscreen-expected.txt
new file mode 100644
index 0000000..6a87e45
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/animated-svg-as-image-transformed-offscreen-expected.txt
@@ -0,0 +1,53 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [3012, 3024],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='targetDiv'",
+      "bounds": [3000, 3000],
+      "transform": 2
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 878],
+      "bounds": [1178, 22]
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 878]
+    },
+    {
+      "name": "Scroll corner of LayoutView #document",
+      "position": [1178, 878],
+      "bounds": [22, 22],
+      "contentsOpaque": true
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -1500, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/append-text-node-to-tspan-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/append-text-node-to-tspan-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/append-text-node-to-tspan-expected.txt
new file mode 100644
index 0000000..7d9a8fe
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/append-text-node-to-tspan-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [15, 90, 465, 570]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/change-background-color-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/change-background-color-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/change-background-color-expected.txt
new file mode 100644
index 0000000..7822c75
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/change-background-color-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 300, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/circle-move-invalidation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/circle-move-invalidation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/circle-move-invalidation-expected.txt
new file mode 100644
index 0000000..f9162c82
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/circle-move-invalidation-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [294, 294, 114, 114],
+        [69, 69, 114, 114]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/clip-path-child-changes-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/clip-path-child-changes-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/clip-path-child-changes-expected.txt
new file mode 100644
index 0000000..ce8c643
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/clip-path-child-changes-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 300, 300]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/clip-path-href-changes-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/clip-path-href-changes-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/clip-path-href-changes-expected.txt
new file mode 100644
index 0000000..ce8c643
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/clip-path-href-changes-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 300, 300]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/clip-path-id-changes-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/clip-path-id-changes-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/clip-path-id-changes-expected.txt
new file mode 100644
index 0000000..ce8c643
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/clip-path-id-changes-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 300, 300]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/clip-path-units-changes-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/clip-path-units-changes-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/clip-path-units-changes-expected.txt
new file mode 100644
index 0000000..ce8c643
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/clip-path-units-changes-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 300, 300]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/color-fill-currentColor-and-css-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/color-fill-currentColor-and-css-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/color-fill-currentColor-and-css-expected.txt
new file mode 100644
index 0000000..363b7ed0
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/color-fill-currentColor-and-css-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 120, 120]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/color-stop-properties-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/color-stop-properties-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/color-stop-properties-expected.txt
new file mode 100644
index 0000000..9b1c986
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/color-stop-properties-expected.txt
@@ -0,0 +1,53 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1212, 930],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [912, 552, 150, 150],
+        [912, 372, 150, 150],
+        [912, 192, 150, 150],
+        [912, 12, 150, 150],
+        [732, 552, 150, 150],
+        [732, 372, 150, 150],
+        [732, 192, 150, 150],
+        [732, 12, 150, 150],
+        [552, 552, 150, 150],
+        [552, 372, 150, 150],
+        [552, 192, 150, 150],
+        [552, 12, 150, 150],
+        [372, 552, 150, 150],
+        [372, 372, 150, 150],
+        [372, 192, 150, 150],
+        [372, 12, 150, 150],
+        [192, 552, 150, 150],
+        [192, 372, 150, 150],
+        [192, 192, 150, 150],
+        [192, 12, 150, 150],
+        [12, 552, 150, 150],
+        [12, 372, 150, 150],
+        [12, 192, 150, 150],
+        [12, 12, 150, 150]
+      ]
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 878],
+      "bounds": [1178, 22]
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 878]
+    },
+    {
+      "name": "Scroll corner of LayoutView #document",
+      "position": [1178, 878],
+      "bounds": [22, 22],
+      "contentsOpaque": true
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/composited-svg-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/composited-svg-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/composited-svg-expected.txt
new file mode 100644
index 0000000..6c66e22
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/composited-svg-expected.txt
@@ -0,0 +1,51 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutSVGRect rect id='rect'",
+      "position": [10, 10],
+      "bounds": [100, 100],
+      "contentsOpaque": true,
+      "transform": 3
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1.5, 0, 0, 0],
+        [0, 1.5, 0, 0],
+        [0, 0, 1, 0],
+        [0, 0, 0, 1]
+      ],
+      "origin": [0, 0]
+    },
+    {
+      "id": 3,
+      "parent": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, 50, 0, 1]
+      ],
+      "flattenInheritedTransform": false
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/container-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/container-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/container-repaint-expected.txt
new file mode 100644
index 0000000..84041a0
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/container-repaint-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 150, 150, 75],
+        [0, 75, 150, 75]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/deep-dynamic-updates-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/deep-dynamic-updates-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/deep-dynamic-updates-expected.txt
new file mode 100644
index 0000000..6cbcad9c
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/deep-dynamic-updates-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [37, 37, 601, 601]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/deep-nested-embedded-svg-size-changes-no-layout-triggers-1-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/deep-nested-embedded-svg-size-changes-no-layout-triggers-1-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/deep-nested-embedded-svg-size-changes-no-layout-triggers-1-expected.txt
new file mode 100644
index 0000000..573ea1b1
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/deep-nested-embedded-svg-size-changes-no-layout-triggers-1-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [2, 2, 603, 303]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/deep-nested-embedded-svg-size-changes-no-layout-triggers-2-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/deep-nested-embedded-svg-size-changes-no-layout-triggers-2-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/deep-nested-embedded-svg-size-changes-no-layout-triggers-2-expected.txt
new file mode 100644
index 0000000..573ea1b1
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/deep-nested-embedded-svg-size-changes-no-layout-triggers-2-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [2, 2, 603, 303]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/embedded-svg-size-changes-no-layout-triggers-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/embedded-svg-size-changes-no-layout-triggers-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/embedded-svg-size-changes-no-layout-triggers-expected.txt
new file mode 100644
index 0000000..38f7515
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/embedded-svg-size-changes-no-layout-triggers-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 603, 303]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/ems-display-none-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/ems-display-none-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/ems-display-none-expected.txt
new file mode 100644
index 0000000..545745a5
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/ems-display-none-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [75, 81, 860, 128]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/exs-display-none-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/exs-display-none-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/exs-display-none-expected.txt
new file mode 100644
index 0000000..8981e69
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/exs-display-none-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [75, 78, 860, 125]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-change-target-id-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-change-target-id-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-change-target-id-expected.txt
new file mode 100644
index 0000000..7068f8f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-change-target-id-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-multiple-targets-id-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-multiple-targets-id-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-multiple-targets-id-change-expected.txt
new file mode 100644
index 0000000..8dfbc6c1
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-multiple-targets-id-change-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [67, 0, 91, 135],
+        [0, 0, 83, 135]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-reference-invalidation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-reference-invalidation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-reference-invalidation-expected.txt
new file mode 100644
index 0000000..9323aa8
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-reference-invalidation-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 135, 135]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-remove-target-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-remove-target-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-remove-target-expected.txt
new file mode 100644
index 0000000..7068f8f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-remove-target-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-target-add-to-document-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-target-add-to-document-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-target-add-to-document-expected.txt
new file mode 100644
index 0000000..9323aa8
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-target-add-to-document-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 135, 135]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-target-attribute-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-target-attribute-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-target-attribute-change-expected.txt
new file mode 100644
index 0000000..9323aa8
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-target-attribute-change-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 135, 135]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection-2-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection-2-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection-2-expected.txt
new file mode 100644
index 0000000..9323aa8
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection-2-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 135, 135]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection-expected.txt
new file mode 100644
index 0000000..9323aa8
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 135, 135]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-target-changes-id-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-target-changes-id-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-target-changes-id-expected.txt
new file mode 100644
index 0000000..7068f8f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-target-changes-id-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-target-id-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-target-id-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-target-id-change-expected.txt
new file mode 100644
index 0000000..7068f8f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-target-id-change-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-target-inline-style-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-target-inline-style-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-target-inline-style-change-expected.txt
new file mode 100644
index 0000000..9323aa8
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-target-inline-style-change-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 135, 135]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-target-property-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-target-property-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-target-property-change-expected.txt
new file mode 100644
index 0000000..9323aa8
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-target-property-change-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 135, 135]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-target-reappend-to-document-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-target-reappend-to-document-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-target-reappend-to-document-expected.txt
new file mode 100644
index 0000000..9323aa8
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-target-reappend-to-document-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 135, 135]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-target-remove-from-document-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-target-remove-from-document-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-target-remove-from-document-expected.txt
new file mode 100644
index 0000000..9323aa8
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-target-remove-from-document-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 135, 135]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-target-style-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-target-style-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-target-style-change-expected.txt
new file mode 100644
index 0000000..9323aa8
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/feImage-target-style-change-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 135, 135]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/fecomponenttransfer-in1-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/fecomponenttransfer-in1-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/fecomponenttransfer-in1-change-expected.txt
new file mode 100644
index 0000000..7068f8f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/fecomponenttransfer-in1-change-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/fill-opacity-update-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/fill-opacity-update-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/fill-opacity-update-expected.txt
new file mode 100644
index 0000000..ce8c643
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/fill-opacity-update-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 300, 300]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/filter-child-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/filter-child-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/filter-child-repaint-expected.txt
new file mode 100644
index 0000000..d1bb859
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/filter-child-repaint-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 158, 158]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/filter-reference-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/filter-reference-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/filter-reference-change-expected.txt
new file mode 100644
index 0000000..72edcfd
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/filter-reference-change-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/filter-refresh-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/filter-refresh-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/filter-refresh-expected.txt
new file mode 100644
index 0000000..026cb05
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/filter-refresh-expected.txt
@@ -0,0 +1,28 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [210, 210, 45, 45],
+        [210, 150, 45, 45],
+        [210, 90, 45, 45],
+        [135, 255, 45, 45],
+        [135, 195, 45, 45],
+        [135, 135, 45, 45],
+        [135, 75, 45, 45],
+        [75, 255, 45, 45],
+        [75, 195, 45, 45],
+        [75, 135, 45, 45],
+        [75, 75, 45, 45],
+        [15, 255, 45, 45],
+        [15, 195, 45, 45],
+        [15, 135, 45, 45],
+        [15, 75, 45, 45]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/filter-width-update-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/filter-width-update-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/filter-width-update-expected.txt
new file mode 100644
index 0000000..562cec4
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/filter-width-update-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 210, 210]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/focus-element-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/focus-element-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/focus-element-expected.png
new file mode 100644
index 0000000..1b36b19
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/focus-element-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/focus-element-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/focus-element-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/focus-element-expected.txt
new file mode 100644
index 0000000..30666bb
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/focus-element-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [81, 81, 87, 87]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/foreign-object-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/foreign-object-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/foreign-object-repaint-expected.txt
new file mode 100644
index 0000000..7542f52
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/foreign-object-repaint-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [193, 300, 214, 213],
+        [75, 75, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/foreignObject-crash-on-hover-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/foreignObject-crash-on-hover-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/foreignObject-crash-on-hover-expected.txt
new file mode 100644
index 0000000..36ece76f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/foreignObject-crash-on-hover-expected.txt
@@ -0,0 +1,11 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/gradient-add-stops-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/gradient-add-stops-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/gradient-add-stops-expected.txt
new file mode 100644
index 0000000..7068f8f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/gradient-add-stops-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/gradient-stop-style-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/gradient-stop-style-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/gradient-stop-style-change-expected.txt
new file mode 100644
index 0000000..7068f8f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/gradient-stop-style-change-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/hairline-stroke-squarecap-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/hairline-stroke-squarecap-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/hairline-stroke-squarecap-expected.txt
new file mode 100644
index 0000000..1fa0933
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/hairline-stroke-squarecap-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [296, 296, 159, 159],
+        [146, 146, 158, 158]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/image-href-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/image-href-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/image-href-change-expected.txt
new file mode 100644
index 0000000..ce8c643
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/image-href-change-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 300, 300]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/image-with-clip-path-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/image-with-clip-path-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/image-with-clip-path-expected.txt
new file mode 100644
index 0000000..ddad8bb1
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/image-with-clip-path-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [30, 30, 90, 90],
+        [262, 37, 76, 76]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/inner-svg-change-viewBox-contract-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/inner-svg-change-viewBox-contract-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/inner-svg-change-viewBox-contract-expected.txt
new file mode 100644
index 0000000..ce8c643
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/inner-svg-change-viewBox-contract-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 300, 300]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/inner-svg-change-viewBox-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/inner-svg-change-viewBox-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/inner-svg-change-viewBox-expected.txt
new file mode 100644
index 0000000..7068f8f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/inner-svg-change-viewBox-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.txt
new file mode 100644
index 0000000..ce8c643
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 300, 300]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/invalidate-on-child-layout-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/invalidate-on-child-layout-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/invalidate-on-child-layout-expected.txt
new file mode 100644
index 0000000..a7f38533
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/invalidate-on-child-layout-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [60, 60, 180, 180],
+        [0, 0, 165, 165]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.txt
new file mode 100644
index 0000000..07328300
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [25, 60, 1175, 252]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-late-clipPath-creation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-late-clipPath-creation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-late-clipPath-creation-expected.txt
new file mode 100644
index 0000000..07328300
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-late-clipPath-creation-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [25, 60, 1175, 252]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.txt
new file mode 100644
index 0000000..7c291e2
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 22, 1138, 543]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-late-gradient-creation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-late-gradient-creation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-late-gradient-creation-expected.txt
new file mode 100644
index 0000000..6fcf557
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-late-gradient-creation-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [50, 33, 1045, 286]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-late-marker-and-object-creation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-late-marker-and-object-creation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-late-marker-and-object-creation-expected.txt
new file mode 100644
index 0000000..46d6c3c
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-late-marker-and-object-creation-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [284, 297, 207, 206]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-late-marker-creation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-late-marker-creation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-late-marker-creation-expected.txt
new file mode 100644
index 0000000..46d6c3c
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-late-marker-creation-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [284, 297, 207, 206]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.txt
new file mode 100644
index 0000000..12992d88
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 22, 1025, 543]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-late-pattern-creation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-late-pattern-creation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-late-pattern-creation-expected.txt
new file mode 100644
index 0000000..3e5114f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-late-pattern-creation-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [50, 33, 935, 286]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-repaint-rect-on-path-with-stroke-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-repaint-rect-on-path-with-stroke-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-repaint-rect-on-path-with-stroke-expected.txt
new file mode 100644
index 0000000..624c293
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-repaint-rect-on-path-with-stroke-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [44, 44, 212, 137],
+        [269, 44, 182, 137]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-bounce-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-bounce-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-bounce-expected.txt
new file mode 100644
index 0000000..d5e1d3b
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-bounce-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [152, 152, 101, 101],
+        [2, 2, 101, 101]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-container-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-container-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-container-expected.txt
new file mode 100644
index 0000000..8bfdeab4
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-container-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 113, 113]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-gradient-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-gradient-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-gradient-expected.txt
new file mode 100644
index 0000000..6513cc30
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-gradient-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [15, 150, 645, 120],
+        [15, 15, 645, 120]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-image-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-image-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-image-expected.txt
new file mode 100644
index 0000000..8bfdeab4
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-image-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 113, 113]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-pattern-child-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-pattern-child-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-pattern-child-expected.txt
new file mode 100644
index 0000000..6513cc30
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-pattern-child-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [15, 150, 645, 120],
+        [15, 15, 645, 120]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-pattern-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-pattern-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-pattern-expected.txt
new file mode 100644
index 0000000..6513cc30
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-pattern-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [15, 150, 645, 120],
+        [15, 15, 645, 120]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-polygon-changes-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-polygon-changes-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-polygon-changes-expected.txt
new file mode 100644
index 0000000..7d3f5e5
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-polygon-changes-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [380, 313, 275, 192],
+        [380, 298, 275, 192]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-polygon-removal-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-polygon-removal-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-polygon-removal-expected.txt
new file mode 100644
index 0000000..85ab216
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-polygon-removal-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [380, 313, 275, 192]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-stop-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-stop-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-stop-expected.txt
new file mode 100644
index 0000000..6513cc30
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-stop-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [15, 150, 645, 120],
+        [15, 15, 645, 120]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-stop-linked-gradient-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-stop-linked-gradient-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-stop-linked-gradient-expected.txt
new file mode 100644
index 0000000..ddc4459
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-stop-linked-gradient-expected.txt
@@ -0,0 +1,16 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [15, 315, 645, 120],
+        [15, 165, 645, 120],
+        [15, 15, 645, 120]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-style-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-style-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-style-expected.txt
new file mode 100644
index 0000000..802b382
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-style-expected.txt
@@ -0,0 +1,17 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [9, 279, 237, 87],
+        [9, 189, 237, 87],
+        [9, 99, 237, 87],
+        [9, 9, 237, 87]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-transform-addition-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-transform-addition-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-transform-addition-expected.txt
new file mode 100644
index 0000000..85ab216
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-transform-addition-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [380, 313, 275, 192]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-transform-changes-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-transform-changes-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-transform-changes-expected.txt
new file mode 100644
index 0000000..85ab216
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/js-update-transform-changes-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [380, 313, 275, 192]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/marker-child-changes-css-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/marker-child-changes-css-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/marker-child-changes-css-expected.txt
new file mode 100644
index 0000000..e3542b4a
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/marker-child-changes-css-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [170, 178, 125, 124]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/marker-child-changes-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/marker-child-changes-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/marker-child-changes-expected.txt
new file mode 100644
index 0000000..e3542b4a
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/marker-child-changes-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [170, 178, 125, 124]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/marker-strokeWidth-changes-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/marker-strokeWidth-changes-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/marker-strokeWidth-changes-expected.txt
new file mode 100644
index 0000000..e3542b4a
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/marker-strokeWidth-changes-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [170, 178, 125, 124]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/marker-text-decoration-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/marker-text-decoration-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/marker-text-decoration-change-expected.txt
new file mode 100644
index 0000000..856b6bd
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/marker-text-decoration-change-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 21, 222, 27]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/marker-viewBox-changes-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/marker-viewBox-changes-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/marker-viewBox-changes-expected.txt
new file mode 100644
index 0000000..6166b9f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/marker-viewBox-changes-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [134, 142, 161, 160]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/mask-clip-target-transform-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/mask-clip-target-transform-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/mask-clip-target-transform-expected.png
new file mode 100644
index 0000000..a0fad1e
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/mask-clip-target-transform-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/mask-clip-target-transform-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/mask-clip-target-transform-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/mask-clip-target-transform-expected.txt
new file mode 100644
index 0000000..8b274e27
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/mask-clip-target-transform-expected.txt
@@ -0,0 +1,16 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 510, 180],
+        [120, 0, 360, 510],
+        [75, 225, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/mask-invalidation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/mask-invalidation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/mask-invalidation-expected.txt
new file mode 100644
index 0000000..d5c7d6a
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/mask-invalidation-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 1200, 900]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/modify-inserted-listitem-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/modify-inserted-listitem-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/modify-inserted-listitem-expected.txt
new file mode 100644
index 0000000..ac31aa3a
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/modify-inserted-listitem-expected.txt
@@ -0,0 +1,16 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [42, 57, 15, 15],
+        [42, 27, 15, 15],
+        [27, 27, 15, 15]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/modify-text-node-in-tspan-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/modify-text-node-in-tspan-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/modify-text-node-in-tspan-expected.txt
new file mode 100644
index 0000000..7d9a8fe
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/modify-text-node-in-tspan-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [15, 90, 465, 570]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/modify-transferred-listitem-different-attr-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/modify-transferred-listitem-different-attr-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/modify-transferred-listitem-different-attr-expected.txt
new file mode 100644
index 0000000..8926a4f0
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/modify-transferred-listitem-different-attr-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [34, 12, 128, 36],
+        [87, 67, 75, 41]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/modify-transferred-listitem-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/modify-transferred-listitem-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/modify-transferred-listitem-expected.txt
new file mode 100644
index 0000000..215f5d0
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/modify-transferred-listitem-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [27, 27, 45, 30]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-1-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-1-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-1-expected.txt
new file mode 100644
index 0000000..38f7515
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-1-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 603, 303]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-2-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-2-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-2-expected.txt
new file mode 100644
index 0000000..38f7515
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-2-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 603, 303]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/object-sizing-no-width-height-change-content-box-size-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/object-sizing-no-width-height-change-content-box-size-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/object-sizing-no-width-height-change-content-box-size-expected.txt
new file mode 100644
index 0000000..ad27897
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/object-sizing-no-width-height-change-content-box-size-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 603, 603]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/outline-offset-shape-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/outline-offset-shape-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/outline-offset-shape-expected.txt
new file mode 100644
index 0000000..26aa8dd8
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/outline-offset-shape-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [16, 16, 217, 217],
+        [189, 16, 216, 217]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/outline-offset-text-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/outline-offset-text-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/outline-offset-text-expected.txt
index 6cff288..5556be3 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/outline-offset-text-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/outline-offset-text-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/overflow-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/overflow-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/overflow-repaint-expected.txt
new file mode 100644
index 0000000..36605bc
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/overflow-repaint-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 162, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/paintorder-filtered-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/paintorder-filtered-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/paintorder-filtered-expected.txt
new file mode 100644
index 0000000..287b110b
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/paintorder-filtered-expected.txt
@@ -0,0 +1,17 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [476, 244, 207, 207],
+        [67, 244, 207, 207],
+        [681, 244, 206, 207],
+        [272, 244, 206, 207]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/path-pathlength-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/path-pathlength-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/path-pathlength-change-expected.txt
new file mode 100644
index 0000000..74ec95f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/path-pathlength-change-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [101, 101, 272, 272]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/pending-resource-after-removal-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/pending-resource-after-removal-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/pending-resource-after-removal-expected.txt
new file mode 100644
index 0000000..ce8c643
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/pending-resource-after-removal-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 300, 300]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/rect-modify-rx-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/rect-modify-rx-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/rect-modify-rx-expected.txt
new file mode 100644
index 0000000..7068f8f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/rect-modify-rx-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/relative-sized-content-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/relative-sized-content-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/relative-sized-content-expected.txt
new file mode 100644
index 0000000..a1f32e9
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/relative-sized-content-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 102, 603, 603]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/relative-sized-content-with-resources-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/relative-sized-content-with-resources-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/relative-sized-content-with-resources-expected.txt
new file mode 100644
index 0000000..a1f32e9
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/relative-sized-content-with-resources-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 102, 603, 603]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/relative-sized-deep-shadow-tree-content-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/relative-sized-deep-shadow-tree-content-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/relative-sized-deep-shadow-tree-content-expected.txt
new file mode 100644
index 0000000..a1f32e9
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/relative-sized-deep-shadow-tree-content-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 102, 603, 603]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/relative-sized-document-scrollbars-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/relative-sized-document-scrollbars-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/relative-sized-document-scrollbars-expected.txt
new file mode 100644
index 0000000..3496b0f7
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/relative-sized-document-scrollbars-expected.txt
@@ -0,0 +1,33 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [2036, 1517],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 2036, 1517]
+      ]
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 878],
+      "bounds": [1178, 22]
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 878]
+    },
+    {
+      "name": "Scroll corner of LayoutView #document",
+      "position": [1178, 878],
+      "bounds": [22, 22],
+      "contentsOpaque": true,
+      "invalidations": [
+        [0, 0, 22, 22]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/relative-sized-image-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/relative-sized-image-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/relative-sized-image-expected.txt
new file mode 100644
index 0000000..a1f32e9
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/relative-sized-image-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 102, 603, 603]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/relative-sized-inner-svg-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/relative-sized-inner-svg-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/relative-sized-inner-svg-expected.txt
new file mode 100644
index 0000000..23427fb
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/relative-sized-inner-svg-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 75, 603, 603]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/relative-sized-shadow-tree-content-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/relative-sized-shadow-tree-content-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/relative-sized-shadow-tree-content-expected.txt
new file mode 100644
index 0000000..a1f32e9
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/relative-sized-shadow-tree-content-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 102, 603, 603]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/relative-sized-shadow-tree-content-with-symbol-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/relative-sized-shadow-tree-content-with-symbol-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/relative-sized-shadow-tree-content-with-symbol-expected.txt
new file mode 100644
index 0000000..a1f32e9
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/relative-sized-shadow-tree-content-with-symbol-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 102, 603, 603]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/relative-sized-use-on-symbol-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/relative-sized-use-on-symbol-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/relative-sized-use-on-symbol-expected.txt
new file mode 100644
index 0000000..23427fb
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/relative-sized-use-on-symbol-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 75, 603, 603]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.txt
new file mode 100644
index 0000000..23427fb
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 75, 603, 603]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/remove-background-property-on-root-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/remove-background-property-on-root-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/remove-background-property-on-root-expected.txt
new file mode 100644
index 0000000..72edcfd
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/remove-background-property-on-root-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/remove-border-property-on-root-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/remove-border-property-on-root-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/remove-border-property-on-root-expected.txt
new file mode 100644
index 0000000..21553b1
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/remove-border-property-on-root-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 180, 180]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/remove-outline-property-on-root-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/remove-outline-property-on-root-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/remove-outline-property-on-root-expected.txt
new file mode 100644
index 0000000..e1ca6ee
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/remove-outline-property-on-root-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 177, 177]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/remove-text-node-from-tspan-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/remove-text-node-from-tspan-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/remove-text-node-from-tspan-expected.txt
new file mode 100644
index 0000000..7d9a8fe
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/remove-text-node-from-tspan-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [15, 90, 465, 570]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/remove-tspan-from-text-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/remove-tspan-from-text-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/remove-tspan-from-text-expected.txt
new file mode 100644
index 0000000..fb059eb
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/remove-tspan-from-text-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [15, 90, 465, 390]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/repaint-in-scrolled-view-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/repaint-in-scrolled-view-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/repaint-in-scrolled-view-expected.txt
new file mode 100644
index 0000000..2982d310
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/repaint-in-scrolled-view-expected.txt
@@ -0,0 +1,42 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [3000, 3000],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [600, 600, 150, 150]
+      ],
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 878],
+      "bounds": [1178, 22]
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 878]
+    },
+    {
+      "name": "Scroll corner of LayoutView #document",
+      "position": [1178, 878],
+      "bounds": [22, 22],
+      "contentsOpaque": true
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [-600, -600, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/repaint-moving-svg-and-div-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/repaint-moving-svg-and-div-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/repaint-moving-svg-and-div-expected.txt
new file mode 100644
index 0000000..0ab134a
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/repaint-moving-svg-and-div-expected.txt
@@ -0,0 +1,35 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [802, 487, 226, 226],
+        [757, 412, 226, 226],
+        [712, 337, 226, 226],
+        [667, 262, 226, 226],
+        [622, 187, 226, 226],
+        [352, 487, 226, 226],
+        [307, 412, 226, 226],
+        [262, 337, 226, 226],
+        [217, 262, 226, 226],
+        [172, 187, 226, 226],
+        [825, 525, 225, 225],
+        [780, 450, 225, 225],
+        [735, 375, 225, 225],
+        [690, 300, 225, 225],
+        [645, 225, 225, 225],
+        [600, 150, 225, 225],
+        [375, 525, 225, 225],
+        [330, 450, 225, 225],
+        [285, 375, 225, 225],
+        [240, 300, 225, 225],
+        [195, 225, 225, 225],
+        [150, 150, 225, 225]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/repaint-non-scaling-stroke-text-decoration-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/repaint-non-scaling-stroke-text-decoration-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/repaint-non-scaling-stroke-text-decoration-expected.txt
new file mode 100644
index 0000000..7e7269f0
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/repaint-non-scaling-stroke-text-decoration-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [13, 19, 74, 43]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/repaint-non-scaling-stroke-text-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/repaint-non-scaling-stroke-text-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/repaint-non-scaling-stroke-text-expected.txt
new file mode 100644
index 0000000..7e7269f0
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/repaint-non-scaling-stroke-text-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [13, 19, 74, 43]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/repaint-on-constant-size-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/repaint-on-constant-size-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/repaint-on-constant-size-change-expected.txt
new file mode 100644
index 0000000..2516a93
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/repaint-on-constant-size-change-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 300, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/repaint-on-image-bounds-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/repaint-on-image-bounds-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/repaint-on-image-bounds-change-expected.txt
new file mode 100644
index 0000000..7068f8f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/repaint-on-image-bounds-change-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/repaint-paintorder-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/repaint-paintorder-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/repaint-paintorder-expected.txt
new file mode 100644
index 0000000..287b110b
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/repaint-paintorder-expected.txt
@@ -0,0 +1,17 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [476, 244, 207, 207],
+        [67, 244, 207, 207],
+        [681, 244, 206, 207],
+        [272, 244, 206, 207]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/repaint-stroke-width-changes-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/repaint-stroke-width-changes-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/repaint-stroke-width-changes-expected.txt
new file mode 100644
index 0000000..301039f1
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/repaint-stroke-width-changes-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [14, 14, 692, 512]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/resize-svg-invalidate-children-2-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/resize-svg-invalidate-children-2-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/resize-svg-invalidate-children-2-expected.txt
new file mode 100644
index 0000000..e3f4124
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/resize-svg-invalidate-children-2-expected.txt
@@ -0,0 +1,39 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutSVGRoot svg",
+      "bounds": [500, 400],
+      "contentsOpaque": true,
+      "transform": 2
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1.5, 0, 0, 0],
+        [0, 1.5, 0, 0],
+        [0, 0, 1, 0],
+        [75, 0, 0, 1]
+      ],
+      "origin": [0, 0]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/resize-svg-invalidate-children-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/resize-svg-invalidate-children-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/resize-svg-invalidate-children-expected.txt
new file mode 100644
index 0000000..a82722c
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/resize-svg-invalidate-children-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [87, 87, 150, 150],
+        [49, 49, 76, 76]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/resize-svg-root-with-child-stroke-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/resize-svg-root-with-child-stroke-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/resize-svg-root-with-child-stroke-expected.txt
new file mode 100644
index 0000000..e5e37e5
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/resize-svg-root-with-child-stroke-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [11, 11, 152, 171]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/resource-client-removal-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/resource-client-removal-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/resource-client-removal-expected.txt
new file mode 100644
index 0000000..7068f8f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/resource-client-removal-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/resource-invalidate-on-target-update-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/resource-invalidate-on-target-update-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/resource-invalidate-on-target-update-expected.txt
new file mode 100644
index 0000000..161022e
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/resource-invalidate-on-target-update-expected.txt
@@ -0,0 +1,16 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 345, 180],
+        [0, 360, 333, 180],
+        [15, 195, 300, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/rounded-rect-height-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/rounded-rect-height-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/rounded-rect-height-change-expected.txt
new file mode 100644
index 0000000..e149564c
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/rounded-rect-height-change-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 150, 300]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/scale-change-huge-geometry-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/scale-change-huge-geometry-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/scale-change-huge-geometry-expected.txt
new file mode 100644
index 0000000..fa86312
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/scale-change-huge-geometry-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 38, 38]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.png
index 5b2abac..17004916 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt
index c717929..e5c7828 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt
@@ -1,35 +1,34 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1539, 1517],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "invalidations": [
         [314, 1482, 259, 27],
         [643, 1482, 221, 27],
-        [577, 1479, 62, 33],
+        [575, 1477, 66, 37],
         [636, 1482, 7, 27],
         [573, 1482, 7, 27]
       ],
       "transform": 1
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 878],
-      "bounds": [1178, 22],
-      "contentsOpaque": true
+      "bounds": [1178, 22]
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 878],
-      "contentsOpaque": true
+      "bounds": [22, 878]
     },
     {
-      "name": "Scroll Corner Layer",
+      "name": "Scroll corner of LayoutView #document",
       "position": [1178, 878],
-      "bounds": [22, 22]
+      "bounds": [22, 22],
+      "contentsOpaque": true
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/shape-transform-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/shape-transform-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/shape-transform-change-expected.txt
new file mode 100644
index 0000000..f6d414c
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/shape-transform-change-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 300, 300]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/shape-with-nested-outline-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/shape-with-nested-outline-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/shape-with-nested-outline-expected.txt
new file mode 100644
index 0000000..e2dd1ae
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/shape-with-nested-outline-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 750, 750]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/stroke-opacity-update-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/stroke-opacity-update-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/stroke-opacity-update-expected.txt
new file mode 100644
index 0000000..6a40c49d
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/stroke-opacity-update-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 305, 305]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/svg-absolute-children-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/svg-absolute-children-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/svg-absolute-children-expected.txt
new file mode 100644
index 0000000..7068f8f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/svg-absolute-children-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/svg-background-partial-redraw-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/svg-background-partial-redraw-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/svg-background-partial-redraw-expected.txt
index 340b42b9..3eaf5008 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/svg-background-partial-redraw-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/svg-background-partial-redraw-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/svg-image-change-content-size-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/svg-image-change-content-size-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/svg-image-change-content-size-expected.txt
new file mode 100644
index 0000000..bafa16ab
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/svg-image-change-content-size-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 102, 903, 633]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/svg-image-par-resize-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/svg-image-par-resize-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/svg-image-par-resize-expected.txt
new file mode 100644
index 0000000..f6d414c
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/svg-image-par-resize-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 300, 300]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/svg-length-ch-unit-font-size-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/svg-length-ch-unit-font-size-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/svg-length-ch-unit-font-size-change-expected.txt
new file mode 100644
index 0000000..f6d414c
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/svg-length-ch-unit-font-size-change-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 300, 300]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/svg-length-rem-unit-font-size-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/svg-length-rem-unit-font-size-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/svg-length-rem-unit-font-size-change-expected.txt
new file mode 100644
index 0000000..293dec0b
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/svg-length-rem-unit-font-size-change-expected.txt
@@ -0,0 +1,16 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 162, 300, 150],
+        [162, 12, 150, 150],
+        [12, 12, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/svgsvgelement-repaint-children-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/svgsvgelement-repaint-children-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/svgsvgelement-repaint-children-expected.txt
new file mode 100644
index 0000000..72edcfd
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/svgsvgelement-repaint-children-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/tabgroup-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/tabgroup-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/tabgroup-expected.txt
new file mode 100644
index 0000000..b2c3dd3d
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/tabgroup-expected.txt
@@ -0,0 +1,18 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [583, 55, 475, 124],
+        [392, 416, 457, 456],
+        [758, 348, 359, 241],
+        [8, 383, 359, 241],
+        [55, 8, 241, 359]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/text-dom-removal-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/text-dom-removal-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/text-dom-removal-expected.txt
new file mode 100644
index 0000000..673e910
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/text-dom-removal-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [74, 166, 252, 28],
+        [0, 0, 31, 31]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/text-mask-update-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/text-mask-update-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/text-mask-update-expected.txt
new file mode 100644
index 0000000..848bf7d
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/text-mask-update-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 165, 83]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/text-pattern-update-2-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/text-pattern-update-2-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/text-pattern-update-2-expected.txt
new file mode 100644
index 0000000..14f5d1d
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/text-pattern-update-2-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 450, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/text-pattern-update-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/text-pattern-update-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/text-pattern-update-expected.txt
new file mode 100644
index 0000000..72edcfd
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/text-pattern-update-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/text-repaint-including-stroke-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/text-repaint-including-stroke-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/text-repaint-including-stroke-expected.txt
new file mode 100644
index 0000000..e1791a9
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/text-repaint-including-stroke-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [120, 0, 827, 171],
+        [45, 0, 603, 87]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/text-rescale-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/text-rescale-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/text-rescale-expected.txt
new file mode 100644
index 0000000..4e5a51d
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/text-rescale-expected.txt
@@ -0,0 +1,23 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 171, 288, 68],
+        [0, 21, 288, 68],
+        [465, 171, 137, 68],
+        [465, 21, 137, 68],
+        [315, 170, 136, 67],
+        [315, 20, 136, 67],
+        [0, 4, 9, 4],
+        [13, 5, 5, 3],
+        [9, 5, 5, 3],
+        [0, 0, 2, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/text-selection-text-05-t-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/text-selection-text-05-t-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/text-selection-text-05-t-expected.txt
new file mode 100644
index 0000000..bb15043
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/text-selection-text-05-t-expected.txt
@@ -0,0 +1,56 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [24, 784, 662, 114],
+        [782, 19, 186, 49],
+        [532, 19, 186, 49],
+        [282, 19, 186, 49],
+        [400, 727, 165, 41],
+        [400, 302, 165, 31],
+        [642, 727, 153, 41],
+        [642, 302, 153, 31],
+        [885, 727, 140, 41],
+        [885, 302, 140, 31],
+        [567, 54, 116, 49],
+        [25, 737, 110, 48],
+        [25, 662, 110, 48],
+        [25, 587, 110, 48],
+        [25, 512, 110, 48],
+        [25, 437, 110, 48],
+        [25, 362, 110, 48],
+        [25, 287, 110, 48],
+        [25, 212, 110, 48],
+        [25, 137, 110, 48],
+        [642, 427, 91, 78],
+        [642, 652, 91, 41],
+        [642, 227, 91, 28],
+        [885, 427, 90, 78],
+        [400, 427, 90, 78],
+        [885, 652, 90, 41],
+        [400, 652, 90, 41],
+        [885, 227, 90, 28],
+        [400, 227, 90, 28],
+        [339, 54, 72, 49],
+        [885, 502, 68, 78],
+        [642, 502, 66, 78],
+        [400, 502, 65, 78],
+        [844, 54, 62, 49],
+        [617, 352, 56, 78],
+        [597, 152, 56, 28],
+        [860, 352, 55, 78],
+        [375, 352, 53, 78],
+        [375, 577, 53, 66],
+        [822, 152, 53, 28],
+        [375, 152, 53, 28],
+        [847, 577, 43, 66],
+        [617, 577, 41, 66]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/text-selection-update-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/text-selection-update-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/text-selection-update-expected.txt
new file mode 100644
index 0000000..34299566
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/text-selection-update-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [15, 0, 63, 21]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/text-viewbox-rescale-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/text-viewbox-rescale-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/text-viewbox-rescale-expected.txt
new file mode 100644
index 0000000..ce8c643
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/text-viewbox-rescale-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 300, 300]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/text-xy-updates-SVGList-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/text-xy-updates-SVGList-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/text-xy-updates-SVGList-expected.txt
new file mode 100644
index 0000000..fdee460
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/text-xy-updates-SVGList-expected.txt
@@ -0,0 +1,31 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1212, 930],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [312, 21, 257, 27],
+        [27, 291, 257, 27]
+      ]
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 878],
+      "bounds": [1178, 22]
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 878]
+    },
+    {
+      "name": "Scroll corner of LayoutView #document",
+      "position": [1178, 878],
+      "bounds": [22, 22],
+      "contentsOpaque": true
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/transform-changed-state-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/transform-changed-state-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/transform-changed-state-expected.txt
new file mode 100644
index 0000000..d7ac3cd4
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/transform-changed-state-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [162, 162, 150, 150],
+        [162, 12, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/transform-focus-ring-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/transform-focus-ring-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/transform-focus-ring-repaint-expected.txt
new file mode 100644
index 0000000..c1f34a7
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/transform-focus-ring-repaint-expected.txt
@@ -0,0 +1,63 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='target'",
+      "position": [-4, -4],
+      "bounds": [308, 308],
+      "contentsOpaqueForText": true,
+      "backfaceVisibility": "hidden",
+      "backgroundColor": "#FFFF00",
+      "invalidations": [
+        [0, 0, 308, 308]
+      ],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV",
+      "bounds": [660, 450],
+      "contentsOpaqueForText": true,
+      "backfaceVisibility": "hidden",
+      "backgroundColor": "#0000FF",
+      "transform": 3
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 87, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [150, 150, 0, 1]
+      ]
+    },
+    {
+      "id": 3,
+      "parent": 2,
+      "transform": [
+        [0, 1, 0, 0],
+        [-1, 0, 0, 0],
+        [0, 0, 1, 0],
+        [0, 0, 0, 1]
+      ],
+      "origin": [225, 225]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/transform-foreign-object-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/transform-foreign-object-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/transform-foreign-object-expected.txt
new file mode 100644
index 0000000..4cae0a6
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/transform-foreign-object-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [162, 12, 150, 150],
+        [12, 12, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/transform-text-element-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/transform-text-element-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/transform-text-element-expected.txt
new file mode 100644
index 0000000..94085171a
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/transform-text-element-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 87, 600, 150],
+        [12, 12, 600, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/tspan-dynamic-positioning-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/tspan-dynamic-positioning-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/tspan-dynamic-positioning-expected.txt
new file mode 100644
index 0000000..5121970
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/tspan-dynamic-positioning-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [300, 279, 389, 27],
+        [30, 9, 389, 27]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/tspan-pattern-update-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/tspan-pattern-update-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/tspan-pattern-update-expected.txt
new file mode 100644
index 0000000..6235159
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/tspan-pattern-update-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [162, 12, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/use-clipped-hit-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/use-clipped-hit-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/use-clipped-hit-expected.txt
new file mode 100644
index 0000000..5f7eb9c
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/use-clipped-hit-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [135, 174, 95, 27]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/use-detach-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/use-detach-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/use-detach-expected.txt
index 781fa76..7db8e76 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/use-detach-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/use-detach-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/use-disappears-after-style-update-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/use-disappears-after-style-update-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/use-disappears-after-style-update-expected.txt
new file mode 100644
index 0000000..66067072
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/use-disappears-after-style-update-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [75, 15, 45, 45],
+        [15, 15, 45, 45]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/use-inherit-style-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/use-inherit-style-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/use-inherit-style-expected.txt
new file mode 100644
index 0000000..60b00b8
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/use-inherit-style-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 150, 90]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/use-setAttribute-crash-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/use-setAttribute-crash-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/use-setAttribute-crash-expected.txt
new file mode 100644
index 0000000..9a751a79
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/use-setAttribute-crash-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [41, 41, 92, 92]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/window-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/window-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/window-expected.txt
new file mode 100644
index 0000000..a9d77bc
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/svg/window-expected.txt
@@ -0,0 +1,17 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [56, 213, 825, 591],
+        [919, 121, 278, 25],
+        [935, 137, 262, 239],
+        [919, 121, 25, 239]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/add-table-overpaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/add-table-overpaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/add-table-overpaint-expected.txt
new file mode 100644
index 0000000..c015f226
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/add-table-overpaint-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [3, 471, 228, 228]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/animated-row-background-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/animated-row-background-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/animated-row-background-expected.txt
new file mode 100644
index 0000000..77379f5
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/animated-row-background-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [15, 15, 309, 153],
+        [12, 171, 75, 75]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/border-collapse-change-collapse-to-separate-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/border-collapse-change-collapse-to-separate-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/border-collapse-change-collapse-to-separate-expected.txt
new file mode 100644
index 0000000..4bd8d78
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/border-collapse-change-collapse-to-separate-expected.txt
@@ -0,0 +1,16 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 318, 162],
+        [177, 15, 162, 162],
+        [15, 15, 159, 162]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/border-collapse-change-separate-to-collapse-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/border-collapse-change-separate-to-collapse-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/border-collapse-change-separate-to-collapse-expected.txt
new file mode 100644
index 0000000..4bd8d78
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/border-collapse-change-separate-to-collapse-expected.txt
@@ -0,0 +1,16 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 318, 162],
+        [177, 15, 162, 162],
+        [15, 15, 159, 162]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-69296-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-69296-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-69296-expected.txt
new file mode 100644
index 0000000..89df420
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-69296-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [30, 30, 240, 76]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-cell-append-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-cell-append-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-cell-append-expected.txt
new file mode 100644
index 0000000..73090ce
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-cell-append-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 180, 84]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-cell-remove-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-cell-remove-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-cell-remove-expected.txt
new file mode 100644
index 0000000..cabec17f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-cell-remove-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 252, 81]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-cell-border-color-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-cell-border-color-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-cell-border-color-expected.txt
new file mode 100644
index 0000000..0ffb620
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-cell-border-color-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 171, 81]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-cell-border-width-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-cell-border-width-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-cell-border-width-expected.txt
new file mode 100644
index 0000000..0ffb620
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-cell-border-width-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 171, 81]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-cell-sl-border-color-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-cell-sl-border-color-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-cell-sl-border-color-expected.txt
new file mode 100644
index 0000000..0ffb620
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-cell-sl-border-color-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 171, 81]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-col-border-color-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-col-border-color-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-col-border-color-expected.txt
new file mode 100644
index 0000000..e531ca4
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-col-border-color-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 170, 156]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-col-border-width-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-col-border-width-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-col-border-width-expected.txt
new file mode 100644
index 0000000..e531ca4
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-col-border-width-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 170, 156]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-colgroup-border-color-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-colgroup-border-color-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-colgroup-border-color-expected.txt
new file mode 100644
index 0000000..8c06426f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-colgroup-border-color-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 251, 156]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-colgroup-border-width-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-colgroup-border-width-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-colgroup-border-width-expected.txt
new file mode 100644
index 0000000..8c06426f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-colgroup-border-width-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 251, 156]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-row-border-color-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-row-border-color-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-row-border-color-expected.txt
new file mode 100644
index 0000000..72c2411
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-row-border-color-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 90, 154]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-row-border-width-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-row-border-width-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-row-border-width-expected.txt
new file mode 100644
index 0000000..72c2411
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-row-border-width-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 90, 154]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-table-border-color-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-table-border-color-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-table-border-color-expected.txt
new file mode 100644
index 0000000..f0ce51a
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-table-border-color-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 90, 81]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-table-border-width-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-table-border-width-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-table-border-width-expected.txt
new file mode 100644
index 0000000..f0ce51a
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-table-border-width-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 90, 81]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-tbody-border-color-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-tbody-border-color-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-tbody-border-color-expected.txt
new file mode 100644
index 0000000..89b755b
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-tbody-border-color-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 171, 229]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-tbody-border-width-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-tbody-border-width-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-tbody-border-width-expected.txt
new file mode 100644
index 0000000..89b755b
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/cached-change-tbody-border-width-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 171, 229]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/caret-contenteditable-content-after-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/caret-contenteditable-content-after-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/caret-contenteditable-content-after-expected.png
index 64f2360a..41b4490 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/caret-contenteditable-content-after-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/caret-contenteditable-content-after-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/caret-contenteditable-content-after-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/caret-contenteditable-content-after-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/caret-contenteditable-content-after-expected.txt
new file mode 100644
index 0000000..d1c2faf2
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/caret-contenteditable-content-after-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [8, 62, 1184, 35]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/collapsed-border-cell-resize-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/collapsed-border-cell-resize-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/collapsed-border-cell-resize-expected.txt
new file mode 100644
index 0000000..a00a8e2
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/collapsed-border-cell-resize-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 156, 306]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/collapsed-border-change-rowspan-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/collapsed-border-change-rowspan-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/collapsed-border-change-rowspan-expected.txt
new file mode 100644
index 0000000..fa4f610
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/collapsed-border-change-rowspan-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 300, 450]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-col-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-col-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-col-expected.txt
new file mode 100644
index 0000000..d9ff482
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-col-expected.txt
@@ -0,0 +1,30 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 39, 277, 201]
+      ]
+    },
+    {
+      "name": "LayoutNGTableCell TD",
+      "bounds": [88, 96],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [107, 141, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-col-initial-empty-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-col-initial-empty-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-col-initial-empty-expected.txt
new file mode 100644
index 0000000..d9ff482
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-col-initial-empty-expected.txt
@@ -0,0 +1,30 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 39, 277, 201]
+      ]
+    },
+    {
+      "name": "LayoutNGTableCell TD",
+      "bounds": [88, 96],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [107, 141, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-col-span-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-col-span-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-col-span-expected.txt
new file mode 100644
index 0000000..7da3b35
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-col-span-expected.txt
@@ -0,0 +1,44 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 39, 277, 201]
+      ]
+    },
+    {
+      "name": "LayoutNGTableCell TD",
+      "bounds": [88, 96],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGTableCell TD",
+      "bounds": [88, 96],
+      "transform": 2
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [107, 141, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [198, 141, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-col-span-initial-empty-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-col-span-initial-empty-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-col-span-initial-empty-expected.txt
new file mode 100644
index 0000000..7da3b35
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-col-span-initial-empty-expected.txt
@@ -0,0 +1,44 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 39, 277, 201]
+      ]
+    },
+    {
+      "name": "LayoutNGTableCell TD",
+      "bounds": [88, 96],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGTableCell TD",
+      "bounds": [88, 96],
+      "transform": 2
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [107, 141, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [198, 141, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-colgroup-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-colgroup-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-colgroup-expected.txt
new file mode 100644
index 0000000..ed69b1f4
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-colgroup-expected.txt
@@ -0,0 +1,30 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 39, 277, 201]
+      ]
+    },
+    {
+      "name": "LayoutNGTableCell TD id='target'",
+      "bounds": [88, 96],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [107, 141, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-colgroup-initial-empty-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-colgroup-initial-empty-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-colgroup-initial-empty-expected.txt
new file mode 100644
index 0000000..ed69b1f4
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-colgroup-initial-empty-expected.txt
@@ -0,0 +1,30 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 39, 277, 201]
+      ]
+    },
+    {
+      "name": "LayoutNGTableCell TD id='target'",
+      "bounds": [88, 96],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [107, 141, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-composited-row-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-composited-row-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-composited-row-expected.txt
new file mode 100644
index 0000000..0c7dfd0
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-composited-row-expected.txt
@@ -0,0 +1,45 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGTableRow TR id='target'",
+      "bounds": [271, 96],
+      "invalidations": [
+        [0, 0, 271, 96]
+      ],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGTableCell TD",
+      "bounds": [88, 96],
+      "transform": 2
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [15, 141, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [92, 0, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-composited-row-initial-empty-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-composited-row-initial-empty-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-composited-row-initial-empty-expected.txt
new file mode 100644
index 0000000..0c7dfd0
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-composited-row-initial-empty-expected.txt
@@ -0,0 +1,45 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGTableRow TR id='target'",
+      "bounds": [271, 96],
+      "invalidations": [
+        [0, 0, 271, 96]
+      ],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGTableCell TD",
+      "bounds": [88, 96],
+      "transform": 2
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [15, 141, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [92, 0, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-expected.txt
new file mode 100644
index 0000000..d7c3c33
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-expected.txt
@@ -0,0 +1,30 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [15, 141, 271, 96]
+      ]
+    },
+    {
+      "name": "LayoutNGTableCell TD",
+      "bounds": [88, 96],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [107, 141, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-initial-empty-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-initial-empty-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-initial-empty-expected.txt
new file mode 100644
index 0000000..d7c3c33
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-initial-empty-expected.txt
@@ -0,0 +1,30 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [15, 141, 271, 96]
+      ]
+    },
+    {
+      "name": "LayoutNGTableCell TD",
+      "bounds": [88, 96],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [107, 141, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-section-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-section-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-section-expected.txt
new file mode 100644
index 0000000..f8288b9
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-section-expected.txt
@@ -0,0 +1,45 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGTableSection TBODY id='target'",
+      "bounds": [271, 195],
+      "invalidations": [
+        [0, 0, 271, 195]
+      ],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGTableCell TD",
+      "bounds": [88, 96],
+      "transform": 2
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [15, 42, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [92, 99, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-section-initial-empty-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-section-initial-empty-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-section-initial-empty-expected.txt
new file mode 100644
index 0000000..f8288b9
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-background-section-initial-empty-expected.txt
@@ -0,0 +1,45 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGTableSection TBODY id='target'",
+      "bounds": [271, 195],
+      "invalidations": [
+        [0, 0, 271, 195]
+      ],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGTableCell TD",
+      "bounds": [88, 96],
+      "transform": 2
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [15, 42, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [92, 99, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-row-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-row-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-row-expected.txt
new file mode 100644
index 0000000..6b2888f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/composited-table-row-expected.txt
@@ -0,0 +1,31 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGTableRow TR",
+      "position": [-1, -1],
+      "bounds": [115, 33],
+      "invalidations": [
+        [0, 0, 58, 33]
+      ],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [13, 13, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/dynamic-table-vertical-alignment-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/dynamic-table-vertical-alignment-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/dynamic-table-vertical-alignment-change-expected.txt
index fb87a92..057bd0dd 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/dynamic-table-vertical-alignment-change-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/dynamic-table-vertical-alignment-change-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1212, 878],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
@@ -10,10 +10,9 @@
       ]
     },
     {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "name": "HorizontalScrollbar",
       "position": [0, 878],
-      "bounds": [1200, 22],
-      "contentsOpaque": true
+      "bounds": [1200, 22]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/fixed-table-cell-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/fixed-table-cell-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/fixed-table-cell-expected.txt
new file mode 100644
index 0000000..943676f1
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/fixed-table-cell-expected.txt
@@ -0,0 +1,50 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 3024],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [300, 300, 150, 150]
+      ],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) TD id='moveMe' class='fixed'",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "invalidations": [
+        [0, 0, 150, 150]
+      ],
+      "transform": 2
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -150, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [75, 150, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/fixed-table-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/fixed-table-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/fixed-table-overflow-expected.txt
new file mode 100644
index 0000000..5a38b6a
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/fixed-table-overflow-expected.txt
@@ -0,0 +1,52 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 3024],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [150, 150, 150, 150],
+        [0, 150, 150, 150]
+      ],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) TD id='moveMe' class='fixed'",
+      "position": [-150, 0],
+      "bounds": [300, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "invalidations": [
+        [0, 0, 300, 150]
+      ],
+      "transform": 2
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -150, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [150, 0, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/fixed-table-overflow-zindex-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/fixed-table-overflow-zindex-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/fixed-table-overflow-zindex-expected.txt
new file mode 100644
index 0000000..ad290a1
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/fixed-table-overflow-zindex-expected.txt
@@ -0,0 +1,50 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 3024],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 150, 150, 150]
+      ],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) TD id='moveMe' class='fixed'",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "invalidations": [
+        [0, 0, 150, 150]
+      ],
+      "transform": 2
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -150, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [150, 0, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/input-overflow-in-table-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/input-overflow-in-table-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/input-overflow-in-table-expected.txt
new file mode 100644
index 0000000..4c4e1d14
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/input-overflow-in-table-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [11, 11, 152, 32]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/invalidate-cell-in-row-with-offset-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/invalidate-cell-in-row-with-offset-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/invalidate-cell-in-row-with-offset-expected.txt
new file mode 100644
index 0000000..4f6cc1f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/invalidate-cell-in-row-with-offset-expected.txt
@@ -0,0 +1,47 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGTableRow TR",
+      "bounds": [153, 153],
+      "contentsOpaque": true,
+      "backgroundColor": "#FF0000",
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGTableRow TR class='shadow-inset'",
+      "bounds": [321, 153],
+      "contentsOpaqueForText": true,
+      "invalidations": [
+        [0, 0, 153, 153]
+      ],
+      "transform": 2
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [27, 42, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [27, 210, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/invisible-col-visible-td-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/invisible-col-visible-td-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/invisible-col-visible-td-expected.txt
new file mode 100644
index 0000000..f6d414c
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/invisible-col-visible-td-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 300, 300]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/invisible-tbody-visible-td-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/invisible-tbody-visible-td-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/invisible-tbody-visible-td-expected.txt
index 84311e1..59984b6 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/invisible-tbody-visible-td-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/invisible-tbody-visible-td-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/invisible-tr-visible-td-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/invisible-tr-visible-td-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/invisible-tr-visible-td-expected.txt
index 84311e1..59984b6 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/invisible-tr-visible-td-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/invisible-tr-visible-td-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/no-caret-repaint-in-non-content-editable-element-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/no-caret-repaint-in-non-content-editable-element-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/no-caret-repaint-in-non-content-editable-element-expected.txt
new file mode 100644
index 0000000..36ece76f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/no-caret-repaint-in-non-content-editable-element-expected.txt
@@ -0,0 +1,11 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/repaint-table-row-in-composited-document-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/repaint-table-row-in-composited-document-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/repaint-table-row-in-composited-document-expected.txt
new file mode 100644
index 0000000..c09dc6c9
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/repaint-table-row-in-composited-document-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [384, 459, 306, 156],
+        [384, 234, 306, 156]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/replace-col-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/replace-col-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/replace-col-expected.txt
new file mode 100644
index 0000000..5a383161
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/replace-col-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 123, 84, 111]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/resize-table-repaint-percent-size-cell-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/resize-table-repaint-percent-size-cell-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/resize-table-repaint-percent-size-cell-expected.txt
index d6b8449..1639bb8 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/resize-table-repaint-percent-size-cell-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/resize-table-repaint-percent-size-cell-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/resize-table-repaint-vertical-align-cell-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/resize-table-repaint-vertical-align-cell-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/resize-table-repaint-vertical-align-cell-expected.txt
new file mode 100644
index 0000000..7ab9817
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/resize-table-repaint-vertical-align-cell-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [4, 422, 94, 26],
+        [4, 137, 94, 26]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/resize-table-row-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/resize-table-row-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/resize-table-row-repaint-expected.txt
new file mode 100644
index 0000000..fd6151ac
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/resize-table-row-repaint-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [4, 290, 94, 26],
+        [4, 215, 94, 26]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/row-change-background-rowspan-cell-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/row-change-background-rowspan-cell-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/row-change-background-rowspan-cell-expected.txt
new file mode 100644
index 0000000..908604da2
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/row-change-background-rowspan-cell-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [15, 447, 159, 159]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/scroll-inside-table-cell-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/scroll-inside-table-cell-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/scroll-inside-table-cell-expected.txt
new file mode 100644
index 0000000..9b2a20c
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/scroll-inside-table-cell-expected.txt
@@ -0,0 +1,68 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FF0000"
+    },
+    {
+      "name": "LayoutNGTableCell (relative positioned) TD id='cellToScroll' class='relative'",
+      "position": [3, 3],
+      "bounds": [653, 676],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [3, 679],
+      "bounds": [653, 22],
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [656, 3],
+      "bounds": [22, 698],
+      "contentsOpaqueForText": true,
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='relative red'",
+      "position": [3, 3],
+      "bounds": [675, 675],
+      "contentsOpaque": true,
+      "backgroundColor": "#FF0000",
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV class='absolute green'",
+      "position": [753, 3],
+      "bounds": [675, 675],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "transform": 2
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [468, 168, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [-772, 0, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.txt
new file mode 100644
index 0000000..32a53f7
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.txt
@@ -0,0 +1,22 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1588, 878],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [1214, 106, 55, 26],
+        [814, 106, 55, 26],
+        [414, 106, 55, 26],
+        [14, 106, 55, 26]
+      ]
+    },
+    {
+      "name": "HorizontalScrollbar",
+      "position": [0, 878],
+      "bounds": [1200, 22]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-cell-collapsed-border-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-cell-collapsed-border-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-cell-collapsed-border-expected.txt
new file mode 100644
index 0000000..1771d2a
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-cell-collapsed-border-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [3, 89, 664, 610]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-cell-move-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-cell-move-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-cell-move-expected.txt
new file mode 100644
index 0000000..ae6d50dd
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-cell-move-expected.txt
@@ -0,0 +1,16 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 480, 90, 90],
+        [12, 390, 90, 90],
+        [12, 300, 90, 90]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-cell-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-cell-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-cell-overflow-expected.txt
index 3c0c3a1..b1c0242 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-cell-overflow-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-cell-overflow-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-col-background-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-col-background-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-col-background-expected.txt
index da31353..74f9dcf7 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-col-background-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-col-background-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-col-background-offset-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-col-background-offset-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-col-background-offset-expected.txt
index d2dd2f4c..c85bfc1 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-col-background-offset-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-col-background-offset-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-collapsed-border-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-collapsed-border-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-collapsed-border-expected.txt
index 4f680c1..8c6ee59 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-collapsed-border-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-collapsed-border-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-extra-bottom-grow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-extra-bottom-grow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-extra-bottom-grow-expected.txt
new file mode 100644
index 0000000..f5b8135
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-extra-bottom-grow-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 195, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-outer-border-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-outer-border-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-outer-border-expected.txt
new file mode 100644
index 0000000..ccdcba9
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-outer-border-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 198, 224]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-overflow-auto-in-overflow-auto-scrolled-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-overflow-auto-in-overflow-auto-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-overflow-auto-in-overflow-auto-scrolled-expected.txt
new file mode 100644
index 0000000..c88e0d9
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-overflow-auto-in-overflow-auto-scrolled-expected.txt
@@ -0,0 +1,88 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='outerDiv'",
+      "bounds": [1154, 450],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1154, 0],
+      "bounds": [22, 450],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='outerDiv'",
+      "bounds": [1154, 1050],
+      "contentsOpaqueForText": true,
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='innerDiv'",
+      "bounds": [1132, 600],
+      "drawsContent": false,
+      "transform": 3
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1132, 0],
+      "bounds": [22, 600],
+      "transform": 3
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='innerDiv'",
+      "bounds": [459, 1215],
+      "contentsOpaqueForText": true,
+      "transform": 4
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -450, 0, 1]
+      ]
+    },
+    {
+      "id": 3,
+      "parent": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, 450, 0, 1]
+      ]
+    },
+    {
+      "id": 4,
+      "parent": 3,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -609, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-overflow-scroll-in-overflow-scroll-scrolled-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-overflow-scroll-in-overflow-scroll-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-overflow-scroll-in-overflow-scroll-scrolled-expected.txt
new file mode 100644
index 0000000..c88e0d9
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-overflow-scroll-in-overflow-scroll-scrolled-expected.txt
@@ -0,0 +1,88 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='outerDiv'",
+      "bounds": [1154, 450],
+      "drawsContent": false,
+      "transform": 1
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1154, 0],
+      "bounds": [22, 450],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='outerDiv'",
+      "bounds": [1154, 1050],
+      "contentsOpaqueForText": true,
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='innerDiv'",
+      "bounds": [1132, 600],
+      "drawsContent": false,
+      "transform": 3
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1132, 0],
+      "bounds": [22, 600],
+      "transform": 3
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='innerDiv'",
+      "bounds": [459, 1215],
+      "contentsOpaqueForText": true,
+      "transform": 4
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    },
+    {
+      "id": 2,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -450, 0, 1]
+      ]
+    },
+    {
+      "id": 3,
+      "parent": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, 450, 0, 1]
+      ]
+    },
+    {
+      "id": 4,
+      "parent": 3,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -609, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-row-bg-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-row-bg-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-row-bg-change-expected.txt
new file mode 100644
index 0000000..33bb000a
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-row-bg-change-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [15, 15, 294, 146]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-row-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-row-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-row-expected.txt
new file mode 100644
index 0000000..544d3907
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-row-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [15, 15, 153, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-section-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-section-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-section-overflow-expected.txt
index 24880862..8c37023 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-section-overflow-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-section-overflow-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-section-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-section-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-section-repaint-expected.txt
new file mode 100644
index 0000000..f97ef87
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-section-repaint-expected.txt
@@ -0,0 +1,23 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 462, 90, 125],
+        [12, 372, 90, 45],
+        [12, 327, 90, 45],
+        [12, 282, 90, 45],
+        [12, 237, 90, 45],
+        [12, 192, 90, 45],
+        [12, 147, 90, 45],
+        [12, 102, 90, 45],
+        [12, 57, 90, 45],
+        [12, 12, 90, 45]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-section-visual-overflow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-section-visual-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-section-visual-overflow-expected.txt
new file mode 100644
index 0000000..834e80e
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-section-visual-overflow-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [215, 0, 180, 177],
+        [0, 0, 177, 177]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-shrink-row-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-shrink-row-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-shrink-row-repaint-expected.txt
new file mode 100644
index 0000000..c7257ff
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-shrink-row-repaint-expected.txt
@@ -0,0 +1,37 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1178, 1272],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 165, 1154, 315],
+        [12, 1170, 1154, 90],
+        [12, 1110, 1154, 90],
+        [12, 1080, 1154, 90],
+        [12, 1020, 1154, 90],
+        [12, 990, 1154, 90],
+        [12, 930, 1154, 90],
+        [12, 900, 1154, 90],
+        [12, 840, 1154, 90],
+        [12, 810, 1154, 90],
+        [12, 750, 1154, 90],
+        [12, 720, 1154, 90],
+        [12, 660, 1154, 90],
+        [12, 630, 1154, 90],
+        [12, 570, 1154, 90],
+        [12, 540, 1154, 90],
+        [12, 480, 1154, 90],
+        [12, 450, 1154, 90],
+        [12, 1200, 1154, 72]
+      ]
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [1178, 0],
+      "bounds": [22, 900]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-two-pass-layout-overpaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-two-pass-layout-overpaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-two-pass-layout-overpaint-expected.txt
index aa1d13979..53e43cb 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-two-pass-layout-overpaint-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-two-pass-layout-overpaint-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-with-padding-row-invalidation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-with-padding-row-invalidation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-with-padding-row-invalidation-expected.txt
new file mode 100644
index 0000000..be0a70b
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/table/table-with-padding-row-invalidation-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 390, 75]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/text-append-dirty-lines-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/text-append-dirty-lines-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/text-append-dirty-lines-expected.txt
new file mode 100644
index 0000000..e783bb19
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/text-append-dirty-lines-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 63, 1174, 188]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/text-line-clamp-truncation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/text-line-clamp-truncation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/text-line-clamp-truncation-expected.txt
new file mode 100644
index 0000000..86894402
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/text-line-clamp-truncation-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 17, 428, 62]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/text-match-document-change-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/text-match-document-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/text-match-document-change-expected.txt
new file mode 100644
index 0000000..d596471
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/text-match-document-change-expected.txt
@@ -0,0 +1,36 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "VerticalScrollbar",
+      "position": [428, 0],
+      "bounds": [22, 600],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow HTML",
+      "bounds": [428, 1578],
+      "invalidations": [
+        [12, 39, 389, 54]
+      ],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [15, 153, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/caret-with-transformation-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/caret-with-transformation-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/caret-with-transformation-expected.png
index 82fa21d7..a742bce 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/caret-with-transformation-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/caret-with-transformation-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/caret-with-transformation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/caret-with-transformation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/caret-with-transformation-expected.txt
new file mode 100644
index 0000000..b4f4d52
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/caret-with-transformation-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [64, 54, 16, 25],
+        [526, 321, 15, 24]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/invalidation-with-scale-transform-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/invalidation-with-scale-transform-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/invalidation-with-scale-transform-expected.txt
index 38c0d9f3..2568317 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/invalidation-with-scale-transform-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/invalidation-with-scale-transform-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/resize-skewed-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/resize-skewed-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/resize-skewed-expected.txt
new file mode 100644
index 0000000..4654344f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/resize-skewed-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [150, 75, 900, 750]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/subtree-layoutstate-transform-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/subtree-layoutstate-transform-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/subtree-layoutstate-transform-expected.txt
new file mode 100644
index 0000000..27088cb
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/subtree-layoutstate-transform-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [42, 69, 300, 300]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/transform-disable-layoutstate-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/transform-disable-layoutstate-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/transform-disable-layoutstate-expected.txt
new file mode 100644
index 0000000..944ae158
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/transform-disable-layoutstate-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [87, 132, 750, 320]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/transform-inline-layered-child-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/transform-inline-layered-child-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/transform-inline-layered-child-expected.txt
new file mode 100644
index 0000000..ffac08c
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/transform-inline-layered-child-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [209, 540, 225, 269],
+        [450, 452, 120, 240]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/transform-layout-repaint-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/transform-layout-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/transform-layout-repaint-expected.txt
new file mode 100644
index 0000000..736377fc
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/transform-layout-repaint-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [78, 77, 61, 44]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/transform-repaint-descendants-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/transform-repaint-descendants-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/transform-repaint-descendants-expected.txt
new file mode 100644
index 0000000..1c18f15
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/transform-repaint-descendants-expected.txt
@@ -0,0 +1,16 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [265, 328, 590, 277],
+        [264, 327, 582, 304],
+        [114, 177, 399, 399]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/transform-replaced-shadows-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/transform-replaced-shadows-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/transform-replaced-shadows-expected.txt
new file mode 100644
index 0000000..03c41b9
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/transform-replaced-shadows-expected.txt
@@ -0,0 +1,14 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 12, 432, 480]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/transform-rotate-and-remove-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/transform-rotate-and-remove-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/transform-rotate-and-remove-expected.txt
new file mode 100644
index 0000000..79fda445
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/transform-rotate-and-remove-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [12, 12, 330, 105],
+        [30, 0, 294, 225]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/transform-translate-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/transform-translate-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/transform-translate-expected.txt
new file mode 100644
index 0000000..a3d7b0f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/transform/transform-translate-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [42, 99, 156, 157],
+        [12, 99, 156, 157]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/vertical-align-length1-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/vertical-align-length1-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/vertical-align-length1-expected.txt
new file mode 100644
index 0000000..ba2b59a
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/vertical-align-length1-expected.txt
@@ -0,0 +1,17 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [180, 195, 30, 30],
+        [180, 150, 30, 30],
+        [0, 195, 30, 30],
+        [0, 150, 30, 30]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/vertical-align-length2-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/vertical-align-length2-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/vertical-align-length2-expected.txt
new file mode 100644
index 0000000..f761aa3
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/vertical-align-length2-expected.txt
@@ -0,0 +1,15 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [300, 120, 150, 150],
+        [300, 75, 150, 150]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/vertical-align1-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/vertical-align1-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/vertical-align1-expected.txt
index 3934535a..09eb1ca 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/vertical-align1-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/vertical-align1-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/vertical-align2-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/vertical-align2-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/vertical-align2-expected.txt
index a3c7839..875e630 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/vertical-align2-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/vertical-align2-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/vertical-rl-as-paint-container-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/vertical-rl-as-paint-container-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/vertical-rl-as-paint-container-expected.txt
new file mode 100644
index 0000000..42c97e1
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/vertical-rl-as-paint-container-expected.txt
@@ -0,0 +1,31 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow DIV id='target'",
+      "bounds": [900, 600],
+      "backfaceVisibility": "hidden",
+      "invalidations": [
+        [780, 0, 120, 510]
+      ],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/video-paint-invalidation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/video-paint-invalidation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/video-paint-invalidation-expected.txt
new file mode 100644
index 0000000..1af2ff86
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/video-paint-invalidation-expected.txt
@@ -0,0 +1,32 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutVideo VIDEO id='video'",
+      "bounds": [480, 360],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGFlexibleBox DIV class='sizing-small test-mode phase-ready state-scrubbing'",
+      "bounds": [480, 360],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [12, 12, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/window-resize/window-resize-media-query-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/window-resize/window-resize-media-query-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/window-resize/window-resize-media-query-expected.txt
new file mode 100644
index 0000000..ab7f583
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/paint/invalidation/window-resize/window-resize-media-query-expected.txt
@@ -0,0 +1,50 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [600, 250],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFF00",
+      "invalidations": [
+        [0, 0, 600, 250]
+      ]
+    }
+  ]
+}
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [400, 250],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFF00"
+    }
+  ]
+}
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [400, 600],
+      "contentsOpaque": true,
+      "backgroundColor": "#0000FF",
+      "invalidations": [
+        [0, 0, 400, 600]
+      ]
+    }
+  ]
+}
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "backgroundColor": "#0000FF",
+      "invalidations": [
+        [400, 0, 400, 600]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/transforms/3d/general/cssmatrix-3d-zoom-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/transforms/3d/general/cssmatrix-3d-zoom-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/transforms/3d/general/cssmatrix-3d-zoom-expected.png
new file mode 100644
index 0000000..2c64753
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/transforms/3d/general/cssmatrix-3d-zoom-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/transforms/3d/point-mapping/3d-point-mapping-coplanar-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/transforms/3d/point-mapping/3d-point-mapping-coplanar-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/transforms/3d/point-mapping/3d-point-mapping-coplanar-expected.png
index ffab55a..8f59440 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/transforms/3d/point-mapping/3d-point-mapping-coplanar-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/transforms/3d/point-mapping/3d-point-mapping-coplanar-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/transforms/3d/point-mapping/3d-point-mapping-overlapping-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/transforms/3d/point-mapping/3d-point-mapping-overlapping-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/transforms/3d/point-mapping/3d-point-mapping-overlapping-expected.png
index bcd9562c..dfd001a 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/transforms/3d/point-mapping/3d-point-mapping-overlapping-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/backface-visibility-interop/transforms/3d/point-mapping/3d-point-mapping-overlapping-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/compositor_threaded_scrollbar_scrolling/paint/invalidation/scroll/sticky/invalidate-after-composited-scroll-with-sticky-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/compositor_threaded_scrollbar_scrolling/paint/invalidation/scroll/sticky/invalidate-after-composited-scroll-with-sticky-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/compositor_threaded_scrollbar_scrolling/paint/invalidation/scroll/sticky/invalidate-after-composited-scroll-with-sticky-expected.txt
index 4bdca2fd3..92739f6 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/compositor_threaded_scrollbar_scrolling/paint/invalidation/scroll/sticky/invalidate-after-composited-scroll-with-sticky-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/compositor_threaded_scrollbar_scrolling/paint/invalidation/scroll/sticky/invalidate-after-composited-scroll-with-sticky-expected.txt
@@ -1,25 +1,29 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1178, 984],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow MAT id='scroller'",
-      "bounds": [540, 960],
+      "bounds": [518, 960],
+      "drawsContent": false,
       "transform": 2
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [518, 0],
       "bounds": [22, 960],
       "transform": 2
     },
     {
-      "name": "Scrolling Contents Layer",
-      "bounds": [518, 3027],
+      "name": "LayoutNGBlockFlow MAT id='scroller'",
+      "position": [0, 27],
+      "bounds": [518, 3000],
+      "contentsOpaqueForText": true,
+      "drawsContent": false,
       "transform": 3
     },
     {
@@ -28,10 +32,9 @@
       "transform": 4
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "name": "VerticalScrollbar",
       "position": [1178, 0],
-      "bounds": [22, 900],
-      "contentsOpaque": true
+      "bounds": [22, 900]
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/virtual/delayed-animation-updates/animations/interpolation/clip-path-interpolation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/delayed-animation-updates/animations/interpolation/clip-path-interpolation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/delayed-animation-updates/animations/interpolation/clip-path-interpolation-expected.txt
new file mode 100644
index 0000000..ec0cff2
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/delayed-animation-updates/animations/interpolation/clip-path-interpolation-expected.txt
@@ -0,0 +1,8 @@
+This is a testharness.js-based test.
+PASS This test uses interpolation-test.js.
+PASS CSS Transitions: property <clip-path> from [inset(20px)] to [inset(40%)] at (3.40282e+38) is [inset(calc(3.40282e+38% - 2.26855e+38px))]
+PASS CSS Transitions with transition: all: property <clip-path> from [inset(20px)] to [inset(40%)] at (3.40282e+38) is [inset(calc(3.40282e+38% - 2.26855e+38px))]
+PASS CSS Animations: property <clip-path> from [inset(20px)] to [inset(40%)] at (3.40282e+38) is [inset(calc(3.40282e+38% - 2.26855e+38px))]
+PASS Web Animations: property <clip-path> from [inset(20px)] to [inset(40%)] at (3.40282e+38) is [inset(calc(3.40282e+38% - 2.26855e+38px))]
+Harness: the test ran to completion.
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-border-radius-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-border-radius-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-border-radius-expected.png
index 14a8e6f..4421dbb 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-border-radius-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-border-radius-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/layout_ng_printing/printing/multi-page-background-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/layout_ng_printing/printing/multi-page-background-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/layout_ng_printing/printing/multi-page-background-expected.png
new file mode 100644
index 0000000..1da99ce
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/layout_ng_printing/printing/multi-page-background-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/events/touch/compositor-touch-hit-rects-global-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/events/touch/compositor-touch-hit-rects-global-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/events/touch/compositor-touch-hit-rects-global-expected.txt
new file mode 100644
index 0000000..1d68e1db
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/events/touch/compositor-touch-hit-rects-global-expected.txt
@@ -0,0 +1,12 @@
+This tests verifies the hit test regions given to the compositor in the simple case where touch handles cover (or nearly cover) the entire document. It can only be run in DumpRenderTree.
+
+document: layer(1178x900) has hit test rect (0,0 1178x900)
+document: layer(1178x3000) has hit test rect (0,0 1178x3000)
+
+html: layer(1178x3000) has hit test rect (0,0 1178x3000)
+
+body: layer(1178x3000) has hit test rect (8,24 1163x2952)
+
+webPageOverlay: no rects
+
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/events/touch/compositor-touch-hit-rects-iframes-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/events/touch/compositor-touch-hit-rects-iframes-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/events/touch/compositor-touch-hit-rects-iframes-expected.txt
new file mode 100644
index 0000000..531ef1a
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/events/touch/compositor-touch-hit-rects-iframes-expected.txt
@@ -0,0 +1,14 @@
+This tests verifies the hit test regions given to the compositor when non-composited iframes are involved. It can only be run in DumpRenderTree. The outputted rects should cover the hit test regions of all the listed elements. Enable visualize mode to quickly validate graphically.
+
+iframe: layer(578x147) has hit test rect (20,50 435x33)
+
+iframe-nested: layer(503x147) has hit test rect (20,50 435x33)
+
+iframe-transform: layer(578x147) has hit test rect (20,50 435x33)
+
+iframe-fixed: layer(499x34) has hit test rect (1,1 498x33)
+
+iframe-doc: layer(578x87) has hit test rect (0,0 578x87)
+iframe-doc: layer(1200x900) has hit test rect (15,426 578x38)
+
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/events/touch/compositor-touch-hit-rects-scroll-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/events/touch/compositor-touch-hit-rects-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/events/touch/compositor-touch-hit-rects-scroll-expected.txt
new file mode 100644
index 0000000..5c1fc1f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/events/touch/compositor-touch-hit-rects-scroll-expected.txt
@@ -0,0 +1,20 @@
+This test verifies the hit test regions given to the compositor specifically around composited overflow scroll elements.
+
+scrollContent: layer(410x112) has hit test rect (0,19 410x18)
+
+scrollContent5: layer(410x127) has hit test rect (0,20 410x18)
+
+scrollContent6: layer(410x18) has hit test rect (0,0 410x18)
+
+nestedContent: layer(385x108) has hit test rect (0,45 385x18)
+
+overflowwithhandler: layer(385x174) has hit test rect (0,0 385x174)
+overflowwithhandler: layer(410x168) has hit test rect (0,15 410x78)
+
+overflowwithborder: layer(384x175) has hit test rect (1,1 383x174)
+overflowwithborder: layer(1154x1131) has hit test rect (8,525 435x105)
+
+withTransform: layer(407x18) has hit test rect (0,0 407x18)
+withTransform: layer(410x115) has hit test rect (0,19 410x21)
+
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/events/touch/compositor-touch-hit-rects-squashing-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/events/touch/compositor-touch-hit-rects-squashing-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/events/touch/compositor-touch-hit-rects-squashing-expected.txt
new file mode 100644
index 0000000..9503d9c
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/events/touch/compositor-touch-hit-rects-squashing-expected.txt
@@ -0,0 +1,9 @@
+This test verifies the hit test regions given to the compositor for composited layer squashing.
+
+behind: layer(78x78) has hit test rect (0,0 78x78)
+
+middle: layer(79x79) has hit test rect (1,1 78x78)
+
+top: layer(79x79) has hit test rect (1,1 78x78)
+
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/events/touch/compositor-touch-hit-rects-with-negative-child-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/events/touch/compositor-touch-hit-rects-with-negative-child-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/events/touch/compositor-touch-hit-rects-with-negative-child-expected.txt
new file mode 100644
index 0000000..48bb0fa0
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/events/touch/compositor-touch-hit-rects-with-negative-child-expected.txt
@@ -0,0 +1,5 @@
+This tests verifies the hit test regions given to the compositor for an element with child at negative offset. It can only be run in DumpRenderTree.
+
+negativeOffsetChild: layer(317x20) has hit test rect (1,2 153x18)
+
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/forms/suggestion-picker/date-suggestion-picker-appearance-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/forms/suggestion-picker/date-suggestion-picker-appearance-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/forms/suggestion-picker/date-suggestion-picker-appearance-expected.png
index f27655c..12794cf 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/forms/suggestion-picker/date-suggestion-picker-appearance-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/forms/suggestion-picker/date-suggestion-picker-appearance-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-locale-hebrew-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-locale-hebrew-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-locale-hebrew-expected.png
index 19ae733c..4888b11e 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-locale-hebrew-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-locale-hebrew-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-rtl-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-rtl-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-rtl-expected.png
index bd26d25..db9aff2 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-rtl-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-rtl-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/forms/suggestion-picker/month-suggestion-picker-appearance-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/forms/suggestion-picker/month-suggestion-picker-appearance-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/forms/suggestion-picker/month-suggestion-picker-appearance-expected.png
index c5ffdfc..7707bf6 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/forms/suggestion-picker/month-suggestion-picker-appearance-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/forms/suggestion-picker/month-suggestion-picker-appearance-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/forms/suggestion-picker/time-suggestion-picker-appearance-locale-hebrew-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/forms/suggestion-picker/time-suggestion-picker-appearance-locale-hebrew-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/forms/suggestion-picker/time-suggestion-picker-appearance-locale-hebrew-expected.png
index 43652ce..615acd4 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/forms/suggestion-picker/time-suggestion-picker-appearance-locale-hebrew-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/forms/suggestion-picker/time-suggestion-picker-appearance-locale-hebrew-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/forms/suggestion-picker/week-suggestion-picker-appearance-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/forms/suggestion-picker/week-suggestion-picker-appearance-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/forms/suggestion-picker/week-suggestion-picker-appearance-expected.png
index eb11c59..ea3b964 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/forms/suggestion-picker/week-suggestion-picker-appearance-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification/fast/forms/suggestion-picker/week-suggestion-picker-appearance-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/background-clip-radius-values-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/background-clip-radius-values-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/background-clip-radius-values-expected.png
new file mode 100644
index 0000000..836db2fa
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/background-clip-radius-values-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/background-clip-values-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/background-clip-values-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/background-clip-values-expected.png
new file mode 100644
index 0000000..3c9fc18
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/background-clip-values-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/block-focus-ring-with-border-radius-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/block-focus-ring-with-border-radius-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/block-focus-ring-with-border-radius-expected.png
new file mode 100644
index 0000000..ed22b1d
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/block-focus-ring-with-border-radius-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/getComputedStyle/computed-style-listing-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/getComputedStyle/computed-style-listing-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/getComputedStyle/computed-style-listing-expected.txt
index 056f6d7..32344b79 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/getComputedStyle/computed-style-listing-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/getComputedStyle/computed-style-listing-expected.txt
@@ -2,7 +2,6 @@
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
--webkit-app-region: none
 -webkit-border-horizontal-spacing: 0px
 -webkit-border-image: none
 -webkit-border-vertical-spacing: 0px
@@ -64,6 +63,7 @@
 animation-play-state: running
 animation-timeline: auto
 animation-timing-function: ease
+app-region: none
 appearance: none
 backdrop-filter: none
 backface-visibility: visible
@@ -143,6 +143,13 @@
 column-rule-width: 0px
 column-span: none
 column-width: auto
+contain-intrinsic-block-size: none
+contain-intrinsic-height: none
+contain-intrinsic-inline-size: none
+contain-intrinsic-size: none
+contain-intrinsic-width: none
+container-name: none
+container-type: none
 content: normal
 cursor: auto
 cx: 0px
@@ -170,6 +177,9 @@
 font-size-adjust: none
 font-stretch: 100%
 font-style: normal
+font-synthesis-small-caps: auto
+font-synthesis-style: auto
+font-synthesis-weight: auto
 font-variant: normal
 font-variant-caps: normal
 font-variant-east-asian: normal

third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/inline-focus-ring-with-non-uniform-border-radius-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/inline-focus-ring-with-non-uniform-border-radius-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/inline-focus-ring-with-non-uniform-border-radius-expected.png
new file mode 100644
index 0000000..796fbc5
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/inline-focus-ring-with-non-uniform-border-radius-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/inline-outline-with-border-radius-dashed-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/inline-outline-with-border-radius-dashed-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/inline-outline-with-border-radius-dashed-expected.png
new file mode 100644
index 0000000..f3de55b8
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/inline-outline-with-border-radius-dashed-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/inline-outline-with-border-radius-dotted-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/inline-outline-with-border-radius-dotted-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/inline-outline-with-border-radius-dotted-expected.png
new file mode 100644
index 0000000..3a85996
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/inline-outline-with-border-radius-dotted-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/inline-outline-with-border-radius-double-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/inline-outline-with-border-radius-double-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/inline-outline-with-border-radius-double-expected.png
new file mode 100644
index 0000000..d8a435c
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/inline-outline-with-border-radius-double-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/inline-outline-with-border-radius-groove-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/inline-outline-with-border-radius-groove-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/inline-outline-with-border-radius-groove-expected.png
new file mode 100644
index 0000000..143c80c
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/inline-outline-with-border-radius-groove-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/inline-outline-with-border-radius-inset-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/inline-outline-with-border-radius-inset-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/inline-outline-with-border-radius-inset-expected.png
new file mode 100644
index 0000000..3e5447d
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/inline-outline-with-border-radius-inset-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/inline-outline-with-border-radius-outset-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/inline-outline-with-border-radius-outset-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/inline-outline-with-border-radius-outset-expected.png
new file mode 100644
index 0000000..42108e6
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/inline-outline-with-border-radius-outset-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/inline-outline-with-border-radius-ridge-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/inline-outline-with-border-radius-ridge-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/inline-outline-with-border-radius-ridge-expected.png
new file mode 100644
index 0000000..a7a38a5
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/inline-outline-with-border-radius-ridge-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/inline-outline-with-border-radius-solid-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/inline-outline-with-border-radius-solid-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/inline-outline-with-border-radius-solid-expected.png
new file mode 100644
index 0000000..88a0b23
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/inline-outline-with-border-radius-solid-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/outline-with-border-radius-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/outline-with-border-radius-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/outline-with-border-radius-expected.png
index c291a074..788489a 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/outline-with-border-radius-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/outline-with-border-radius-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/transformed-mask-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/transformed-mask-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/transformed-mask-expected.png
index f89ba5d..f06bb17 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/transformed-mask-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/fast/css/transformed-mask-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/http/tests/devtools/elements/highlight/highlight-css-grid-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/http/tests/devtools/elements/highlight/highlight-css-grid-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/http/tests/devtools/elements/highlight/highlight-css-grid-expected.txt
index 65ca571a..7a47f5b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/http/tests/devtools/elements/highlight/highlight-css-grid-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/http/tests/devtools/elements/highlight/highlight-css-grid-expected.txt
@@ -240,14 +240,6 @@
         {
           "x": 173,
           "y": 133
-        },
-        {
-          "x": 205.5,
-          "y": 133
-        },
-        {
-          "x": 238,
-          "y": 133
         }
       ],
       "negativeColumnLineNumberPositions": [
@@ -533,14 +525,6 @@
         {
           "x": 228,
           "y": 858
-        },
-        {
-          "x": 253,
-          "y": 858
-        },
-        {
-          "x": 278,
-          "y": 858
         }
       ],
       "negativeColumnLineNumberPositions": [

third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/http/tests/devtools/elements/highlight/highlight-css-shapes-outside-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/http/tests/devtools/elements/highlight/highlight-css-shapes-outside-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/http/tests/devtools/elements/highlight/highlight-css-shapes-outside-expected.txt
new file mode 100644
index 0000000..2b028a7f
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/http/tests/devtools/elements/highlight/highlight-css-shapes-outside-expected.txt
@@ -0,0 +1,1739 @@
+Highlight CSS shapes.
+
+circle{
+  "paths": [
+    {
+      "path": [
+        "M",
+        172,
+        92,
+        "Q",
+        172,
+        125,
+        149,
+        149,
+        "Q",
+        125,
+        172,
+        92,
+        172,
+        "Q",
+        59,
+        172,
+        35,
+        149,
+        "Q",
+        12,
+        125,
+        12,
+        92,
+        "Q",
+        12,
+        59,
+        35,
+        35,
+        "Q",
+        59,
+        12,
+        92,
+        12,
+        "Q",
+        125,
+        12,
+        149,
+        35,
+        "Q",
+        172,
+        59,
+        172,
+        92,
+        "Z"
+      ],
+      "fillColor": "rgba(0, 0, 0, 0)"
+    },
+    {
+      "path": [
+        "M",
+        204,
+        92,
+        "Q",
+        204,
+        138,
+        171,
+        171,
+        "Q",
+        138,
+        204,
+        92,
+        204,
+        "Q",
+        46,
+        204,
+        13,
+        171,
+        "Q",
+        -20,
+        138,
+        -20,
+        92,
+        "Q",
+        -20,
+        46,
+        13,
+        13,
+        "Q",
+        46,
+        -20,
+        92,
+        -20,
+        "Q",
+        138,
+        -20,
+        171,
+        13,
+        "Q",
+        204,
+        46,
+        204,
+        92,
+        "Z"
+      ],
+      "fillColor": "rgba(128, 128, 128, 0)"
+    },
+    {
+      "path": [
+        "M",
+        24,
+        24,
+        "L",
+        152,
+        24,
+        "L",
+        152,
+        152,
+        "L",
+        24,
+        152,
+        "Z"
+      ],
+      "fillColor": "rgba(255, 0, 0, 0)",
+      "outlineColor": "rgba(128, 0, 0, 0)",
+      "name": "content"
+    },
+    {
+      "path": [
+        "M",
+        24,
+        24,
+        "L",
+        152,
+        24,
+        "L",
+        152,
+        152,
+        "L",
+        24,
+        152,
+        "Z"
+      ],
+      "fillColor": "rgba(0, 255, 0, 0)",
+      "name": "padding"
+    },
+    {
+      "path": [
+        "M",
+        24,
+        24,
+        "L",
+        152,
+        24,
+        "L",
+        152,
+        152,
+        "L",
+        24,
+        152,
+        "Z"
+      ],
+      "fillColor": "rgba(0, 0, 255, 0)",
+      "name": "border"
+    },
+    {
+      "path": [
+        "M",
+        8,
+        8,
+        "L",
+        168,
+        8,
+        "L",
+        168,
+        168,
+        "L",
+        8,
+        168,
+        "Z"
+      ],
+      "fillColor": "rgba(255, 255, 255, 0)",
+      "name": "margin"
+    }
+  ],
+  "showRulers": true,
+  "showExtensionLines": true,
+  "showAccessibilityInfo": true,
+  "colorFormat": "hex",
+  "elementInfo": {
+    "tagName": "div",
+    "idValue": "circle",
+    "className": ".float.circle",
+    "nodeWidth": "128",
+    "nodeHeight": "128",
+    "isKeyboardFocusable": false,
+    "accessibleName": "",
+    "accessibleRole": "generic",
+    "layoutObjectName": "LayoutNGBlockFlow",
+    "showAccessibilityInfo": true
+  }
+}
+insetSimpleRound{
+  "paths": [
+    {
+      "path": [
+        "M",
+        332,
+        60,
+        "Q",
+        345,
+        60,
+        355,
+        69,
+        "Q",
+        364,
+        79,
+        364,
+        92,
+        "Q",
+        364,
+        105,
+        355,
+        115,
+        "Q",
+        345,
+        124,
+        332,
+        124,
+        "Q",
+        319,
+        124,
+        309,
+        115,
+        "Q",
+        300,
+        105,
+        300,
+        92,
+        "Q",
+        300,
+        79,
+        309,
+        69,
+        "Q",
+        319,
+        60,
+        332,
+        60,
+        "Z"
+      ],
+      "fillColor": "rgba(0, 0, 0, 0)"
+    },
+    {
+      "path": [
+        "M",
+        332,
+        28,
+        "Q",
+        359,
+        28,
+        377,
+        47,
+        "Q",
+        396,
+        65,
+        396,
+        92,
+        "Q",
+        396,
+        119,
+        377,
+        137,
+        "Q",
+        359,
+        156,
+        332,
+        156,
+        "Q",
+        305,
+        156,
+        287,
+        137,
+        "Q",
+        268,
+        119,
+        268,
+        92,
+        "Q",
+        268,
+        65,
+        287,
+        47,
+        "Q",
+        305,
+        28,
+        332,
+        28,
+        "Z"
+      ],
+      "fillColor": "rgba(128, 128, 128, 0)"
+    },
+    {
+      "path": [
+        "M",
+        184,
+        24,
+        "L",
+        312,
+        24,
+        "L",
+        312,
+        152,
+        "L",
+        184,
+        152,
+        "Z"
+      ],
+      "fillColor": "rgba(255, 0, 0, 0)",
+      "outlineColor": "rgba(128, 0, 0, 0)",
+      "name": "content"
+    },
+    {
+      "path": [
+        "M",
+        184,
+        24,
+        "L",
+        312,
+        24,
+        "L",
+        312,
+        152,
+        "L",
+        184,
+        152,
+        "Z"
+      ],
+      "fillColor": "rgba(0, 255, 0, 0)",
+      "name": "padding"
+    },
+    {
+      "path": [
+        "M",
+        184,
+        24,
+        "L",
+        312,
+        24,
+        "L",
+        312,
+        152,
+        "L",
+        184,
+        152,
+        "Z"
+      ],
+      "fillColor": "rgba(0, 0, 255, 0)",
+      "name": "border"
+    },
+    {
+      "path": [
+        "M",
+        168,
+        8,
+        "L",
+        328,
+        8,
+        "L",
+        328,
+        168,
+        "L",
+        168,
+        168,
+        "Z"
+      ],
+      "fillColor": "rgba(255, 255, 255, 0)",
+      "name": "margin"
+    }
+  ],
+  "showRulers": true,
+  "showExtensionLines": true,
+  "showAccessibilityInfo": true,
+  "colorFormat": "hex",
+  "elementInfo": {
+    "tagName": "div",
+    "idValue": "insetSimpleRound",
+    "className": ".float.insetSimpleRound",
+    "nodeWidth": "128",
+    "nodeHeight": "128",
+    "isKeyboardFocusable": false,
+    "accessibleName": "",
+    "accessibleRole": "generic",
+    "layoutObjectName": "LayoutNGBlockFlow",
+    "showAccessibilityInfo": true
+  }
+}
+insetComplexRound{
+  "paths": [
+    {
+      "path": [
+        "M",
+        524,
+        28,
+        "L",
+        572,
+        28,
+        "Q",
+        599,
+        28,
+        617,
+        47,
+        "Q",
+        636,
+        65,
+        636,
+        92,
+        "L",
+        636,
+        140,
+        "Q",
+        636,
+        147,
+        631,
+        151,
+        "Q",
+        627,
+        156,
+        620,
+        156,
+        "L",
+        572,
+        156,
+        "Q",
+        545,
+        156,
+        527,
+        137,
+        "Q",
+        508,
+        119,
+        508,
+        92,
+        "L",
+        508,
+        44,
+        "Q",
+        508,
+        37,
+        513,
+        33,
+        "Q",
+        517,
+        28,
+        524,
+        28,
+        "Z"
+      ],
+      "fillColor": "rgba(0, 0, 0, 0)"
+    },
+    {
+      "path": [
+        "M",
+        524,
+        -4,
+        "L",
+        572,
+        -4,
+        "Q",
+        612,
+        -4,
+        640,
+        24,
+        "Q",
+        668,
+        52,
+        668,
+        92,
+        "L",
+        668,
+        140,
+        "Q",
+        668,
+        160,
+        654,
+        174,
+        "Q",
+        640,
+        188,
+        620,
+        188,
+        "L",
+        572,
+        188,
+        "Q",
+        532,
+        188,
+        504,
+        160,
+        "Q",
+        476,
+        132,
+        476,
+        92,
+        "L",
+        476,
+        44,
+        "Q",
+        476,
+        24,
+        490,
+        10,
+        "Q",
+        504,
+        -4,
+        524,
+        -4,
+        "Z"
+      ],
+      "fillColor": "rgba(128, 128, 128, 0)"
+    },
+    {
+      "path": [
+        "M",
+        344,
+        24,
+        "L",
+        472,
+        24,
+        "L",
+        472,
+        152,
+        "L",
+        344,
+        152,
+        "Z"
+      ],
+      "fillColor": "rgba(255, 0, 0, 0)",
+      "outlineColor": "rgba(128, 0, 0, 0)",
+      "name": "content"
+    },
+    {
+      "path": [
+        "M",
+        344,
+        24,
+        "L",
+        472,
+        24,
+        "L",
+        472,
+        152,
+        "L",
+        344,
+        152,
+        "Z"
+      ],
+      "fillColor": "rgba(0, 255, 0, 0)",
+      "name": "padding"
+    },
+    {
+      "path": [
+        "M",
+        344,
+        24,
+        "L",
+        472,
+        24,
+        "L",
+        472,
+        152,
+        "L",
+        344,
+        152,
+        "Z"
+      ],
+      "fillColor": "rgba(0, 0, 255, 0)",
+      "name": "border"
+    },
+    {
+      "path": [
+        "M",
+        328,
+        8,
+        "L",
+        488,
+        8,
+        "L",
+        488,
+        168,
+        "L",
+        328,
+        168,
+        "Z"
+      ],
+      "fillColor": "rgba(255, 255, 255, 0)",
+      "name": "margin"
+    }
+  ],
+  "showRulers": true,
+  "showExtensionLines": true,
+  "showAccessibilityInfo": true,
+  "colorFormat": "hex",
+  "elementInfo": {
+    "tagName": "div",
+    "idValue": "insetComplexRound",
+    "className": ".float.insetComplexRound",
+    "nodeWidth": "128",
+    "nodeHeight": "128",
+    "isKeyboardFocusable": false,
+    "accessibleName": "",
+    "accessibleRole": "generic",
+    "layoutObjectName": "LayoutNGBlockFlow",
+    "showAccessibilityInfo": true
+  }
+}
+ellipse{
+  "paths": [
+    {
+      "path": [
+        "M",
+        892,
+        68,
+        "Q",
+        892,
+        91,
+        869,
+        108,
+        "Q",
+        845,
+        124,
+        812,
+        124,
+        "Q",
+        779,
+        124,
+        755,
+        108,
+        "Q",
+        732,
+        91,
+        732,
+        68,
+        "Q",
+        732,
+        45,
+        755,
+        28,
+        "Q",
+        779,
+        12,
+        812,
+        12,
+        "Q",
+        845,
+        12,
+        869,
+        28,
+        "Q",
+        892,
+        45,
+        892,
+        68,
+        "Z"
+      ],
+      "fillColor": "rgba(0, 0, 0, 0)"
+    },
+    {
+      "path": [
+        "M",
+        924,
+        68,
+        "Q",
+        924,
+        104,
+        891,
+        130,
+        "Q",
+        858,
+        156,
+        812,
+        156,
+        "Q",
+        766,
+        156,
+        733,
+        130,
+        "Q",
+        700,
+        104,
+        700,
+        68,
+        "Q",
+        700,
+        32,
+        733,
+        6,
+        "Q",
+        766,
+        -20,
+        812,
+        -20,
+        "Q",
+        858,
+        -20,
+        891,
+        6,
+        "Q",
+        924,
+        32,
+        924,
+        68,
+        "Z"
+      ],
+      "fillColor": "rgba(128, 128, 128, 0)"
+    },
+    {
+      "path": [
+        "M",
+        504,
+        24,
+        "L",
+        632,
+        24,
+        "L",
+        632,
+        104,
+        "L",
+        504,
+        104,
+        "Z"
+      ],
+      "fillColor": "rgba(255, 0, 0, 0)",
+      "outlineColor": "rgba(128, 0, 0, 0)",
+      "name": "content"
+    },
+    {
+      "path": [
+        "M",
+        504,
+        24,
+        "L",
+        632,
+        24,
+        "L",
+        632,
+        104,
+        "L",
+        504,
+        104,
+        "Z"
+      ],
+      "fillColor": "rgba(0, 255, 0, 0)",
+      "name": "padding"
+    },
+    {
+      "path": [
+        "M",
+        504,
+        24,
+        "L",
+        632,
+        24,
+        "L",
+        632,
+        104,
+        "L",
+        504,
+        104,
+        "Z"
+      ],
+      "fillColor": "rgba(0, 0, 255, 0)",
+      "name": "border"
+    },
+    {
+      "path": [
+        "M",
+        488,
+        8,
+        "L",
+        648,
+        8,
+        "L",
+        648,
+        120,
+        "L",
+        488,
+        120,
+        "Z"
+      ],
+      "fillColor": "rgba(255, 255, 255, 0)",
+      "name": "margin"
+    }
+  ],
+  "showRulers": true,
+  "showExtensionLines": true,
+  "showAccessibilityInfo": true,
+  "colorFormat": "hex",
+  "elementInfo": {
+    "tagName": "div",
+    "idValue": "ellipse",
+    "className": ".float.ellipse",
+    "nodeWidth": "128",
+    "nodeHeight": "80",
+    "isKeyboardFocusable": false,
+    "accessibleName": "",
+    "accessibleRole": "generic",
+    "layoutObjectName": "LayoutNGBlockFlow",
+    "showAccessibilityInfo": true
+  }
+}
+contentBox{
+  "paths": [
+    {
+      "path": [
+        "M",
+        836,
+        252,
+        "L",
+        868,
+        252,
+        "Q",
+        895,
+        252,
+        913,
+        271,
+        "Q",
+        932,
+        289,
+        932,
+        316,
+        "L",
+        932,
+        348,
+        "Q",
+        932,
+        361,
+        923,
+        371,
+        "Q",
+        913,
+        380,
+        900,
+        380,
+        "L",
+        836,
+        380,
+        "Q",
+        823,
+        380,
+        813,
+        371,
+        "Q",
+        804,
+        361,
+        804,
+        348,
+        "L",
+        804,
+        284,
+        "Q",
+        804,
+        271,
+        813,
+        261,
+        "Q",
+        823,
+        252,
+        836,
+        252,
+        "Z"
+      ],
+      "fillColor": "rgba(0, 0, 0, 0)"
+    },
+    {
+      "path": [
+        "M",
+        836,
+        220,
+        "L",
+        868,
+        220,
+        "Q",
+        908,
+        220,
+        936,
+        248,
+        "Q",
+        964,
+        276,
+        964,
+        316,
+        "L",
+        964,
+        348,
+        "Q",
+        964,
+        375,
+        945,
+        393,
+        "Q",
+        927,
+        412,
+        900,
+        412,
+        "L",
+        836,
+        412,
+        "Q",
+        809,
+        412,
+        791,
+        393,
+        "Q",
+        772,
+        375,
+        772,
+        348,
+        "L",
+        772,
+        284,
+        "Q",
+        772,
+        257,
+        791,
+        239,
+        "Q",
+        809,
+        220,
+        836,
+        220,
+        "Z"
+      ],
+      "fillColor": "rgba(128, 128, 128, 0)"
+    },
+    {
+      "path": [
+        "M",
+        536,
+        168,
+        "L",
+        664,
+        168,
+        "L",
+        664,
+        296,
+        "L",
+        536,
+        296,
+        "Z"
+      ],
+      "fillColor": "rgba(255, 0, 0, 0)",
+      "outlineColor": "rgba(128, 0, 0, 0)",
+      "name": "content"
+    },
+    {
+      "path": [
+        "M",
+        504,
+        152,
+        "L",
+        680,
+        152,
+        "L",
+        680,
+        312,
+        "L",
+        504,
+        312,
+        "Z"
+      ],
+      "fillColor": "rgba(0, 255, 0, 0)",
+      "name": "padding"
+    },
+    {
+      "path": [
+        "M",
+        504,
+        152,
+        "L",
+        680,
+        152,
+        "L",
+        680,
+        312,
+        "L",
+        504,
+        312,
+        "Z"
+      ],
+      "fillColor": "rgba(0, 0, 255, 0)",
+      "name": "border"
+    },
+    {
+      "path": [
+        "M",
+        488,
+        120,
+        "L",
+        696,
+        120,
+        "L",
+        696,
+        328,
+        "L",
+        488,
+        328,
+        "Z"
+      ],
+      "fillColor": "rgba(255, 255, 255, 0)",
+      "name": "margin"
+    }
+  ],
+  "showRulers": true,
+  "showExtensionLines": true,
+  "showAccessibilityInfo": true,
+  "colorFormat": "hex",
+  "elementInfo": {
+    "tagName": "div",
+    "idValue": "contentBox",
+    "className": ".float.contentBox",
+    "nodeWidth": "176",
+    "nodeHeight": "160",
+    "isKeyboardFocusable": false,
+    "accessibleName": "",
+    "accessibleRole": "generic",
+    "layoutObjectName": "LayoutNGBlockFlow",
+    "showAccessibilityInfo": true
+  }
+}
+polygon{
+  "paths": [
+    {
+      "path": [
+        "M",
+        12,
+        492,
+        "L",
+        12,
+        692,
+        "L",
+        212,
+        492,
+        "Z"
+      ],
+      "fillColor": "rgba(0, 0, 0, 0)"
+    },
+    {
+      "path": [
+        "M",
+        24,
+        344,
+        "L",
+        152,
+        344,
+        "L",
+        152,
+        472,
+        "L",
+        24,
+        472,
+        "Z"
+      ],
+      "fillColor": "rgba(255, 0, 0, 0)",
+      "outlineColor": "rgba(128, 0, 0, 0)",
+      "name": "content"
+    },
+    {
+      "path": [
+        "M",
+        24,
+        344,
+        "L",
+        152,
+        344,
+        "L",
+        152,
+        472,
+        "L",
+        24,
+        472,
+        "Z"
+      ],
+      "fillColor": "rgba(0, 255, 0, 0)",
+      "name": "padding"
+    },
+    {
+      "path": [
+        "M",
+        24,
+        344,
+        "L",
+        152,
+        344,
+        "L",
+        152,
+        472,
+        "L",
+        24,
+        472,
+        "Z"
+      ],
+      "fillColor": "rgba(0, 0, 255, 0)",
+      "name": "border"
+    },
+    {
+      "path": [
+        "M",
+        8,
+        328,
+        "L",
+        168,
+        328,
+        "L",
+        168,
+        488,
+        "L",
+        8,
+        488,
+        "Z"
+      ],
+      "fillColor": "rgba(255, 255, 255, 0)",
+      "name": "margin"
+    }
+  ],
+  "showRulers": true,
+  "showExtensionLines": true,
+  "showAccessibilityInfo": true,
+  "colorFormat": "hex",
+  "elementInfo": {
+    "tagName": "div",
+    "idValue": "polygon",
+    "className": ".float.polygon",
+    "nodeWidth": "128",
+    "nodeHeight": "128",
+    "isKeyboardFocusable": false,
+    "accessibleName": "",
+    "accessibleRole": "generic",
+    "layoutObjectName": "LayoutNGBlockFlow",
+    "showAccessibilityInfo": true
+  }
+}
+raster{
+  "paths": [
+    {
+      "path": [
+        "M",
+        276,
+        516,
+        "L",
+        376,
+        516,
+        "L",
+        376,
+        616,
+        "L",
+        276,
+        616,
+        "Z"
+      ],
+      "fillColor": "rgba(0, 0, 0, 0)"
+    },
+    {
+      "path": [
+        "M",
+        249,
+        500,
+        "L",
+        403,
+        500,
+        "L",
+        403,
+        501,
+        "L",
+        249,
+        501,
+        "Z",
+        "M",
+        248,
+        501,
+        "L",
+        404,
+        501,
+        "L",
+        404,
+        502,
+        "L",
+        248,
+        502,
+        "Z",
+        "M",
+        247,
+        502,
+        "L",
+        405,
+        502,
+        "L",
+        405,
+        503,
+        "L",
+        247,
+        503,
+        "Z",
+        "M",
+        247,
+        503,
+        "L",
+        405,
+        503,
+        "L",
+        405,
+        505,
+        "L",
+        247,
+        505,
+        "Z",
+        "M",
+        246,
+        505,
+        "L",
+        406,
+        505,
+        "L",
+        406,
+        507,
+        "L",
+        246,
+        507,
+        "Z",
+        "M",
+        245,
+        507,
+        "L",
+        407,
+        507,
+        "L",
+        407,
+        510,
+        "L",
+        245,
+        510,
+        "Z",
+        "M",
+        245,
+        510,
+        "L",
+        407,
+        510,
+        "L",
+        407,
+        516,
+        "L",
+        245,
+        516,
+        "Z",
+        "M",
+        244,
+        516,
+        "L",
+        408,
+        516,
+        "L",
+        408,
+        616,
+        "L",
+        244,
+        616,
+        "Z",
+        "M",
+        245,
+        616,
+        "L",
+        407,
+        616,
+        "L",
+        407,
+        622,
+        "L",
+        245,
+        622,
+        "Z",
+        "M",
+        245,
+        622,
+        "L",
+        407,
+        622,
+        "L",
+        407,
+        625,
+        "L",
+        245,
+        625,
+        "Z",
+        "M",
+        246,
+        625,
+        "L",
+        406,
+        625,
+        "L",
+        406,
+        627,
+        "L",
+        246,
+        627,
+        "Z",
+        "M",
+        247,
+        627,
+        "L",
+        405,
+        627,
+        "L",
+        405,
+        629,
+        "L",
+        247,
+        629,
+        "Z",
+        "M",
+        247,
+        629,
+        "L",
+        405,
+        629,
+        "L",
+        405,
+        630,
+        "L",
+        247,
+        630,
+        "Z",
+        "M",
+        248,
+        630,
+        "L",
+        404,
+        630,
+        "L",
+        404,
+        631,
+        "L",
+        248,
+        631,
+        "Z",
+        "M",
+        249,
+        631,
+        "L",
+        403,
+        631,
+        "L",
+        403,
+        632,
+        "L",
+        249,
+        632,
+        "Z",
+        "M",
+        249,
+        632,
+        "L",
+        403,
+        632,
+        "L",
+        403,
+        633,
+        "L",
+        249,
+        633,
+        "Z",
+        "M",
+        250,
+        633,
+        "L",
+        402,
+        633,
+        "L",
+        402,
+        634,
+        "L",
+        250,
+        634,
+        "Z",
+        "M",
+        251,
+        634,
+        "L",
+        401,
+        634,
+        "L",
+        401,
+        635,
+        "L",
+        251,
+        635,
+        "Z",
+        "M",
+        251,
+        635,
+        "L",
+        401,
+        635,
+        "L",
+        401,
+        636,
+        "L",
+        251,
+        636,
+        "Z",
+        "M",
+        252,
+        636,
+        "L",
+        400,
+        636,
+        "L",
+        400,
+        637,
+        "L",
+        252,
+        637,
+        "Z",
+        "M",
+        253,
+        637,
+        "L",
+        399,
+        637,
+        "L",
+        399,
+        637,
+        "L",
+        253,
+        637,
+        "Z",
+        "M",
+        253,
+        637,
+        "L",
+        399,
+        637,
+        "L",
+        399,
+        638,
+        "L",
+        253,
+        638,
+        "Z",
+        "M",
+        254,
+        638,
+        "L",
+        398,
+        638,
+        "L",
+        398,
+        639,
+        "L",
+        254,
+        639,
+        "Z",
+        "M",
+        255,
+        639,
+        "L",
+        397,
+        639,
+        "L",
+        397,
+        639,
+        "L",
+        255,
+        639,
+        "Z",
+        "M",
+        255,
+        639,
+        "L",
+        397,
+        639,
+        "L",
+        397,
+        640,
+        "L",
+        255,
+        640,
+        "Z",
+        "M",
+        256,
+        640,
+        "L",
+        396,
+        640,
+        "L",
+        396,
+        641,
+        "L",
+        256,
+        641,
+        "Z",
+        "M",
+        257,
+        641,
+        "L",
+        395,
+        641,
+        "L",
+        395,
+        641,
+        "L",
+        257,
+        641,
+        "Z",
+        "M",
+        258,
+        641,
+        "L",
+        394,
+        641,
+        "L",
+        394,
+        642,
+        "L",
+        258,
+        642,
+        "Z",
+        "M",
+        259,
+        642,
+        "L",
+        393,
+        642,
+        "L",
+        393,
+        643,
+        "L",
+        259,
+        643,
+        "Z",
+        "M",
+        260,
+        643,
+        "L",
+        392,
+        643,
+        "L",
+        392,
+        643,
+        "L",
+        260,
+        643,
+        "Z",
+        "M",
+        261,
+        643,
+        "L",
+        391,
+        643,
+        "L",
+        391,
+        644,
+        "L",
+        261,
+        644,
+        "Z",
+        "M",
+        262,
+        644,
+        "L",
+        390,
+        644,
+        "L",
+        390,
+        645,
+        "L",
+        262,
+        645,
+        "Z",
+        "M",
+        263,
+        645,
+        "L",
+        389,
+        645,
+        "L",
+        389,
+        645,
+        "L",
+        263,
+        645,
+        "Z",
+        "M",
+        265,
+        645,
+        "L",
+        387,
+        645,
+        "L",
+        387,
+        646,
+        "L",
+        265,
+        646,
+        "Z",
+        "M",
+        267,
+        646,
+        "L",
+        385,
+        646,
+        "L",
+        385,
+        647,
+        "L",
+        267,
+        647,
+        "Z",
+        "M",
+        270,
+        647,
+        "L",
+        382,
+        647,
+        "L",
+        382,
+        647,
+        "L",
+        270,
+        647,
+        "Z",
+        "M",
+        276,
+        647,
+        "L",
+        376,
+        647,
+        "L",
+        376,
+        648,
+        "L",
+        276,
+        648,
+        "Z"
+      ],
+      "fillColor": "rgba(128, 128, 128, 0)"
+    },
+    {
+      "path": [
+        "M",
+        184,
+        344,
+        "L",
+        312,
+        344,
+        "L",
+        312,
+        472,
+        "L",
+        184,
+        472,
+        "Z"
+      ],
+      "fillColor": "rgba(255, 0, 0, 0)",
+      "outlineColor": "rgba(128, 0, 0, 0)",
+      "name": "content"
+    },
+    {
+      "path": [
+        "M",
+        184,
+        344,
+        "L",
+        312,
+        344,
+        "L",
+        312,
+        472,
+        "L",
+        184,
+        472,
+        "Z"
+      ],
+      "fillColor": "rgba(0, 255, 0, 0)",
+      "name": "padding"
+    },
+    {
+      "path": [
+        "M",
+        184,
+        344,
+        "L",
+        312,
+        344,
+        "L",
+        312,
+        472,
+        "L",
+        184,
+        472,
+        "Z"
+      ],
+      "fillColor": "rgba(0, 0, 255, 0)",
+      "name": "border"
+    },
+    {
+      "path": [
+        "M",
+        168,
+        328,
+        "L",
+        328,
+        328,
+        "L",
+        328,
+        488,
+        "L",
+        168,
+        488,
+        "Z"
+      ],
+      "fillColor": "rgba(255, 255, 255, 0)",
+      "name": "margin"
+    }
+  ],
+  "showRulers": true,
+  "showExtensionLines": true,
+  "showAccessibilityInfo": true,
+  "colorFormat": "hex",
+  "elementInfo": {
+    "tagName": "div",
+    "idValue": "raster",
+    "className": ".float.raster",
+    "nodeWidth": "128",
+    "nodeHeight": "128",
+    "isKeyboardFocusable": false,
+    "accessibleName": "",
+    "accessibleRole": "generic",
+    "layoutObjectName": "LayoutNGBlockFlow",
+    "showAccessibilityInfo": true
+  }
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/http/tests/devtools/elements/highlight/highlight-css-shapes-outside-scroll-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/http/tests/devtools/elements/highlight/highlight-css-shapes-outside-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/http/tests/devtools/elements/highlight/highlight-css-shapes-outside-scroll-expected.txt
new file mode 100644
index 0000000..4f52665
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/http/tests/devtools/elements/highlight/highlight-css-shapes-outside-scroll-expected.txt
@@ -0,0 +1,393 @@
+Highlight CSS shapes outside scroll.
+
+circle{
+  "paths": [
+    {
+      "path": [
+        "M",
+        172,
+        92,
+        "Q",
+        172,
+        125,
+        149,
+        149,
+        "Q",
+        125,
+        172,
+        92,
+        172,
+        "Q",
+        59,
+        172,
+        35,
+        149,
+        "Q",
+        12,
+        125,
+        12,
+        92,
+        "Q",
+        12,
+        59,
+        35,
+        35,
+        "Q",
+        59,
+        12,
+        92,
+        12,
+        "Q",
+        125,
+        12,
+        149,
+        35,
+        "Q",
+        172,
+        59,
+        172,
+        92,
+        "Z"
+      ],
+      "fillColor": "rgba(0, 0, 0, 0)"
+    },
+    {
+      "path": [
+        "M",
+        204,
+        92,
+        "Q",
+        204,
+        138,
+        171,
+        171,
+        "Q",
+        138,
+        204,
+        92,
+        204,
+        "Q",
+        46,
+        204,
+        13,
+        171,
+        "Q",
+        -20,
+        138,
+        -20,
+        92,
+        "Q",
+        -20,
+        46,
+        13,
+        13,
+        "Q",
+        46,
+        -20,
+        92,
+        -20,
+        "Q",
+        138,
+        -20,
+        171,
+        13,
+        "Q",
+        204,
+        46,
+        204,
+        92,
+        "Z"
+      ],
+      "fillColor": "rgba(128, 128, 128, 0)"
+    },
+    {
+      "path": [
+        "M",
+        24,
+        24,
+        "L",
+        152,
+        24,
+        "L",
+        152,
+        152,
+        "L",
+        24,
+        152,
+        "Z"
+      ],
+      "fillColor": "rgba(255, 0, 0, 0)",
+      "outlineColor": "rgba(128, 0, 0, 0)",
+      "name": "content"
+    },
+    {
+      "path": [
+        "M",
+        24,
+        24,
+        "L",
+        152,
+        24,
+        "L",
+        152,
+        152,
+        "L",
+        24,
+        152,
+        "Z"
+      ],
+      "fillColor": "rgba(0, 255, 0, 0)",
+      "name": "padding"
+    },
+    {
+      "path": [
+        "M",
+        24,
+        24,
+        "L",
+        152,
+        24,
+        "L",
+        152,
+        152,
+        "L",
+        24,
+        152,
+        "Z"
+      ],
+      "fillColor": "rgba(0, 0, 255, 0)",
+      "name": "border"
+    },
+    {
+      "path": [
+        "M",
+        8,
+        8,
+        "L",
+        168,
+        8,
+        "L",
+        168,
+        168,
+        "L",
+        8,
+        168,
+        "Z"
+      ],
+      "fillColor": "rgba(255, 255, 255, 0)",
+      "name": "margin"
+    }
+  ],
+  "showRulers": true,
+  "showExtensionLines": true,
+  "showAccessibilityInfo": true,
+  "colorFormat": "hex",
+  "elementInfo": {
+    "tagName": "div",
+    "idValue": "circle",
+    "className": ".float.circle",
+    "nodeWidth": "128",
+    "nodeHeight": "128",
+    "isKeyboardFocusable": false,
+    "accessibleName": "",
+    "accessibleRole": "generic",
+    "layoutObjectName": "LayoutNGBlockFlow",
+    "showAccessibilityInfo": true
+  }
+}
+circle{
+  "paths": [
+    {
+      "path": [
+        "M",
+        172,
+        92,
+        "Q",
+        172,
+        125,
+        149,
+        149,
+        "Q",
+        125,
+        172,
+        92,
+        172,
+        "Q",
+        59,
+        172,
+        35,
+        149,
+        "Q",
+        12,
+        125,
+        12,
+        92,
+        "Q",
+        12,
+        59,
+        35,
+        35,
+        "Q",
+        59,
+        12,
+        92,
+        12,
+        "Q",
+        125,
+        12,
+        149,
+        35,
+        "Q",
+        172,
+        59,
+        172,
+        92,
+        "Z"
+      ],
+      "fillColor": "rgba(0, 0, 0, 0)"
+    },
+    {
+      "path": [
+        "M",
+        204,
+        92,
+        "Q",
+        204,
+        138,
+        171,
+        171,
+        "Q",
+        138,
+        204,
+        92,
+        204,
+        "Q",
+        46,
+        204,
+        13,
+        171,
+        "Q",
+        -20,
+        138,
+        -20,
+        92,
+        "Q",
+        -20,
+        46,
+        13,
+        13,
+        "Q",
+        46,
+        -20,
+        92,
+        -20,
+        "Q",
+        138,
+        -20,
+        171,
+        13,
+        "Q",
+        204,
+        46,
+        204,
+        92,
+        "Z"
+      ],
+      "fillColor": "rgba(128, 128, 128, 0)"
+    },
+    {
+      "path": [
+        "M",
+        24,
+        24,
+        "L",
+        152,
+        24,
+        "L",
+        152,
+        152,
+        "L",
+        24,
+        152,
+        "Z"
+      ],
+      "fillColor": "rgba(255, 0, 0, 0)",
+      "outlineColor": "rgba(128, 0, 0, 0)",
+      "name": "content"
+    },
+    {
+      "path": [
+        "M",
+        24,
+        24,
+        "L",
+        152,
+        24,
+        "L",
+        152,
+        152,
+        "L",
+        24,
+        152,
+        "Z"
+      ],
+      "fillColor": "rgba(0, 255, 0, 0)",
+      "name": "padding"
+    },
+    {
+      "path": [
+        "M",
+        24,
+        24,
+        "L",
+        152,
+        24,
+        "L",
+        152,
+        152,
+        "L",
+        24,
+        152,
+        "Z"
+      ],
+      "fillColor": "rgba(0, 0, 255, 0)",
+      "name": "border"
+    },
+    {
+      "path": [
+        "M",
+        8,
+        8,
+        "L",
+        168,
+        8,
+        "L",
+        168,
+        168,
+        "L",
+        8,
+        168,
+        "Z"
+      ],
+      "fillColor": "rgba(255, 255, 255, 0)",
+      "name": "margin"
+    }
+  ],
+  "showRulers": true,
+  "showExtensionLines": true,
+  "showAccessibilityInfo": true,
+  "colorFormat": "hex",
+  "elementInfo": {
+    "tagName": "div",
+    "idValue": "circle",
+    "className": ".float.circle",
+    "nodeWidth": "128",
+    "nodeHeight": "128",
+    "isKeyboardFocusable": false,
+    "accessibleName": "",
+    "accessibleRole": "generic",
+    "layoutObjectName": "LayoutNGBlockFlow",
+    "showAccessibilityInfo": true
+  }
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/http/tests/devtools/elements/highlight/highlight-multiple-css-grid-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/http/tests/devtools/elements/highlight/highlight-multiple-css-grid-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/http/tests/devtools/elements/highlight/highlight-multiple-css-grid-expected.txt
index e708d00..b9699a99 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/http/tests/devtools/elements/highlight/highlight-multiple-css-grid-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/http/tests/devtools/elements/highlight/highlight-multiple-css-grid-expected.txt
@@ -145,14 +145,6 @@
         {
           "x": 173,
           "y": 133
-        },
-        {
-          "x": 205.5,
-          "y": 133
-        },
-        {
-          "x": 238,
-          "y": 133
         }
       ],
       "negativeColumnLineNumberPositions": [
@@ -351,14 +343,6 @@
         {
           "x": 108,
           "y": -92
-        },
-        {
-          "x": 218,
-          "y": -92
-        },
-        {
-          "x": 328,
-          "y": -92
         }
       ],
       "negativeColumnLineNumberPositions": [

third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/http/tests/devtools/forced-layout-in-microtask-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/http/tests/devtools/forced-layout-in-microtask-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/http/tests/devtools/forced-layout-in-microtask-expected.txt
new file mode 100644
index 0000000..551a725
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/http/tests/devtools/forced-layout-in-microtask-expected.txt
@@ -0,0 +1,41 @@
+Tests that Layout record has correct locations of layout being invalidated and forced.
+
+Layout Properties:
+{
+    data : {
+        beginData : {
+            dirtyObjects : 4
+            frame : <string>
+            partialLayout : false
+            stackTrace : <object>
+            totalObjects : 4
+        }
+        endData : {
+            layoutRoots : [
+                {
+                    depth : 1
+                    nodeId : <number>
+                    quads : [
+                        [
+                            0
+                            0
+                            1200
+                            0
+                            1200
+                            900
+                            0
+                            900
+                        ]
+                    ]
+                }
+            ]
+        }
+    }
+    endTime : <number>
+    frameId : <string>
+    stackTrace : <object>
+    startTime : <number>
+    type : "Layout"
+}
+Text details for Layout: test://evaluations/0/forced-layout-in-microtask.js:21:36
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/http/tests/devtools/layers/layer-tree-model-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/http/tests/devtools/layers/layer-tree-model-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/http/tests/devtools/layers/layer-tree-model-expected.txt
new file mode 100644
index 0000000..9d13731
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/http/tests/devtools/layers/layer-tree-model-expected.txt
@@ -0,0 +1,35 @@
+Tests general layer tree model functionality
+Initial layer tree
+<invalid node id> 0x0 (0)
+    #document (1)
+    #document (1)
+    div#subframe1 120x120 (1)
+    div#a (1)
+    div#b1 (1)
+    div#b2 (1)
+    div#c 135x150 (1)
+    div#b3 (1)
+    <invalid node id> (1)
+Updated layer tree
+<invalid node id> 0x0 (0)
+    #document (1)
+    #document (1)
+    div#subframe1 120x120 (1)
+    div#a (1)
+    div#b2 (1)
+    div#c 135x150 (1)
+    div#b1
+    div#b4 132x116
+    <invalid node id> (1)
+Updated layer geometry
+<invalid node id> 0x0 (0)
+    #document (1)
+    #document (1)
+    div#subframe1 120x120 (1)
+    div#a (1)
+    div#b2 (1)
+    div#c 135x120 (1)
+    div#b1
+    div#b4 132x116
+    <invalid node id> (1)
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/http/tests/devtools/tracing/timeline-layout/timeline-layout-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/http/tests/devtools/tracing/timeline-layout/timeline-layout-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/http/tests/devtools/tracing/timeline-layout/timeline-layout-expected.txt
new file mode 100644
index 0000000..422810c1
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/shared_array_buffer_on_desktop/http/tests/devtools/tracing/timeline-layout/timeline-layout-expected.txt
@@ -0,0 +1,79 @@
+Tests the Timeline API instrumentation of a Layout event
+
+Layout Properties:
+{
+    data : {
+        beginData : {
+            dirtyObjects : 3
+            frame : <string>
+            partialLayout : true
+            stackTrace : <object>
+            totalObjects : 8
+        }
+        endData : {
+            layoutRoots : [
+                {
+                    depth : 4
+                    nodeId : <number>
+                    quads : [
+                        [
+                            12
+                            12
+                            162
+                            12
+                            162
+                            162
+                            12
+                            162
+                        ]
+                    ]
+                }
+            ]
+        }
+    }
+    endTime : <number>
+    frameId : <string>
+    stackTrace : <object>
+    startTime : <number>
+    type : "Layout"
+}
+Text details for Layout: test://evaluations/0/timeline-layout.js:40:32
+Layout Properties:
+{
+    data : {
+        beginData : {
+            dirtyObjects : 2
+            frame : <string>
+            partialLayout : true
+            stackTrace : <object>
+            totalObjects : 11
+        }
+        endData : {
+            layoutRoots : [
+                {
+                    depth : 4
+                    nodeId : <number>
+                    quads : [
+                        [
+                            12
+                            162
+                            162
+                            162
+                            162
+                            312
+                            12
+                            312
+                        ]
+                    ]
+                }
+            ]
+        }
+    }
+    endTime : <number>
+    frameId : <string>
+    stackTrace : <object>
+    startTime : <number>
+    type : "Layout"
+}
+Text details for Layout: test://evaluations/0/timeline-layout.js:40:32
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/stable/compositing/filters/sw-layer-overlaps-hw-shadow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/stable/compositing/filters/sw-layer-overlaps-hw-shadow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/stable/compositing/filters/sw-layer-overlaps-hw-shadow-expected.txt
index 01bb102..dcff70e 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/stable/compositing/filters/sw-layer-overlaps-hw-shadow-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/stable/compositing/filters/sw-layer-overlaps-hw-shadow-expected.txt
@@ -1,7 +1,7 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
@@ -14,11 +14,10 @@
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV id='software')",
-      "position": [-158, -158],
+      "name": "LayoutNGBlockFlow (positioned) DIV id='software'",
       "bounds": [150, 150],
-      "backgroundColor": "#008000",
-      "transform": 1
+      "contentsOpaque": true,
+      "backgroundColor": "#008000"
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/virtual/stable/compositing/filters/sw-nested-shadow-overlaps-hw-nested-shadow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/stable/compositing/filters/sw-nested-shadow-overlaps-hw-nested-shadow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/stable/compositing/filters/sw-nested-shadow-overlaps-hw-nested-shadow-expected.txt
index 65f675f..0b6e4db 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/stable/compositing/filters/sw-nested-shadow-overlaps-hw-nested-shadow-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/stable/compositing/filters/sw-nested-shadow-overlaps-hw-nested-shadow-expected.txt
@@ -1,15 +1,23 @@
 {
   "layers": [
     {
-      "name": "Scrolling Contents Layer",
+      "name": "Scrolling background of LayoutView #document",
       "bounds": [1200, 900],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='composited-parent'",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#000000",
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='composited-child'",
       "position": [-150, -150],
-      "bounds": [300, 300],
+      "bounds": [150, 150],
+      "contentsOpaqueForText": true,
       "transform": 1
     },
     {
@@ -21,9 +29,8 @@
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='software-child'",
       "position": [150, 150],
-      "bounds": [75, 75],
-      "contentsOpaque": true,
-      "backgroundColor": "#0000FF"
+      "bounds": [150, 150],
+      "contentsOpaqueForText": true
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/highdpi/virtual/stable/compositing/filters/sw-shadow-overlaps-hw-layer-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/stable/compositing/filters/sw-shadow-overlaps-hw-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/stable/compositing/filters/sw-shadow-overlaps-hw-layer-expected.txt
new file mode 100644
index 0000000..63866ce
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/stable/compositing/filters/sw-shadow-overlaps-hw-layer-expected.txt
@@ -0,0 +1,34 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='composited'",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#000000",
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='software'",
+      "bounds": [187, 187],
+      "contentsOpaqueForText": true
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [158, 158, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/stable/compositing/filters/sw-shadow-overlaps-hw-shadow-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/stable/compositing/filters/sw-shadow-overlaps-hw-shadow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/stable/compositing/filters/sw-shadow-overlaps-hw-shadow-expected.txt
new file mode 100644
index 0000000..dda3da2
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/stable/compositing/filters/sw-shadow-overlaps-hw-shadow-expected.txt
@@ -0,0 +1,34 @@
+{
+  "layers": [
+    {
+      "name": "Scrolling background of LayoutView #document",
+      "bounds": [1200, 900],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='composited'",
+      "bounds": [150, 150],
+      "contentsOpaque": true,
+      "backgroundColor": "#000000",
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (positioned) DIV id='software'",
+      "bounds": [187, 187],
+      "contentsOpaqueForText": true
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [195, 195, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/highdpi/virtual/text-antialias/international/rtl-white-space-pre-wrap-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/text-antialias/international/rtl-white-space-pre-wrap-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/text-antialias/international/rtl-white-space-pre-wrap-expected.png
index a28671b..0347fd5 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/text-antialias/international/rtl-white-space-pre-wrap-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/text-antialias/international/rtl-white-space-pre-wrap-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/text-antialias/international/unicode-bidi-plaintext-in-textarea-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/text-antialias/international/unicode-bidi-plaintext-in-textarea-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/text-antialias/international/unicode-bidi-plaintext-in-textarea-expected.png
index f3dbe43..0045c79 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/text-antialias/international/unicode-bidi-plaintext-in-textarea-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/text-antialias/international/unicode-bidi-plaintext-in-textarea-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/virtual/threaded-no-composited-antialiasing/animations/interpolation/clip-path-interpolation-expected.txt

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/threaded-no-composited-antialiasing/animations/interpolation/clip-path-interpolation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/threaded-no-composited-antialiasing/animations/interpolation/clip-path-interpolation-expected.txt
index a41f0b1..ec0cff2 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/threaded-no-composited-antialiasing/animations/interpolation/clip-path-interpolation-expected.txt
+++ b/third_party/blink/web_tests/flag-specific/highdpi/virtual/threaded-no-composited-antialiasing/animations/interpolation/clip-path-interpolation-expected.txt
@@ -1,8 +1,8 @@
 This is a testharness.js-based test.
 PASS This test uses interpolation-test.js.
-FAIL CSS Transitions: property <clip-path> from [inset(20px)] to [inset(40%)] at (3.40282e+38) is [inset(calc(3.40282e+38% - 2.26855e+38px))] assert_equals: expected "inset ( calc ( 3.4e + 38 % - infpx ) ) " but got "inset ( calc ( 3.4e + 38 % - 2.27e + 38px ) ) "
-FAIL CSS Transitions with transition: all: property <clip-path> from [inset(20px)] to [inset(40%)] at (3.40282e+38) is [inset(calc(3.40282e+38% - 2.26855e+38px))] assert_equals: expected "inset ( calc ( 3.4e + 38 % - infpx ) ) " but got "inset ( calc ( 3.4e + 38 % - 2.27e + 38px ) ) "
-FAIL CSS Animations: property <clip-path> from [inset(20px)] to [inset(40%)] at (3.40282e+38) is [inset(calc(3.40282e+38% - 2.26855e+38px))] assert_equals: expected "inset ( calc ( 3.4e + 38 % - infpx ) ) " but got "inset ( calc ( 3.4e + 38 % - 2.27e + 38px ) ) "
-FAIL Web Animations: property <clip-path> from [inset(20px)] to [inset(40%)] at (3.40282e+38) is [inset(calc(3.40282e+38% - 2.26855e+38px))] assert_equals: expected "inset ( calc ( 3.4e + 38 % - infpx ) ) " but got "inset ( calc ( 3.4e + 38 % - 2.27e + 38px ) ) "
+PASS CSS Transitions: property <clip-path> from [inset(20px)] to [inset(40%)] at (3.40282e+38) is [inset(calc(3.40282e+38% - 2.26855e+38px))]
+PASS CSS Transitions with transition: all: property <clip-path> from [inset(20px)] to [inset(40%)] at (3.40282e+38) is [inset(calc(3.40282e+38% - 2.26855e+38px))]
+PASS CSS Animations: property <clip-path> from [inset(20px)] to [inset(40%)] at (3.40282e+38) is [inset(calc(3.40282e+38% - 2.26855e+38px))]
+PASS Web Animations: property <clip-path> from [inset(20px)] to [inset(40%)] at (3.40282e+38) is [inset(calc(3.40282e+38% - 2.26855e+38px))]
 Harness: the test ran to completion.
 

third_party/blink/web_tests/images/color-profile-image-canvas-pattern-expected.png

diff --git a/third_party/blink/web_tests/platform/win/images/color-profile-image-canvas-pattern-expected.png b/third_party/blink/web_tests/images/color-profile-image-canvas-pattern-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/images/color-profile-image-canvas-pattern-expected.png
rename to third_party/blink/web_tests/images/color-profile-image-canvas-pattern-expected.png
Binary files differ

third_party/blink/web_tests/images/yuv-decode-eligible/color-profile-layer-filter-expected.png

diff --git a/third_party/blink/web_tests/platform/win/images/yuv-decode-eligible/color-profile-layer-filter-expected.png b/third_party/blink/web_tests/images/yuv-decode-eligible/color-profile-layer-filter-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/images/yuv-decode-eligible/color-profile-layer-filter-expected.png
rename to third_party/blink/web_tests/images/yuv-decode-eligible/color-profile-layer-filter-expected.png
Binary files differ

third_party/blink/web_tests/media/color-profile-video-expected.png

diff --git a/third_party/blink/web_tests/platform/win/media/color-profile-video-expected.png b/third_party/blink/web_tests/media/color-profile-video-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/media/color-profile-video-expected.png
rename to third_party/blink/web_tests/media/color-profile-video-expected.png
Binary files differ

third_party/blink/web_tests/media/color-profile-video-seek-expected.png

diff --git a/third_party/blink/web_tests/platform/win/media/color-profile-video-seek-expected.png b/third_party/blink/web_tests/media/color-profile-video-seek-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/media/color-profile-video-seek-expected.png
rename to third_party/blink/web_tests/media/color-profile-video-seek-expected.png
Binary files differ

third_party/blink/web_tests/media/color-profile-video-seek-object-fit-expected.png

diff --git a/third_party/blink/web_tests/platform/win/media/color-profile-video-seek-object-fit-expected.png b/third_party/blink/web_tests/media/color-profile-video-seek-object-fit-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/media/color-profile-video-seek-object-fit-expected.png
rename to third_party/blink/web_tests/media/color-profile-video-seek-object-fit-expected.png
Binary files differ

third_party/blink/web_tests/platform/fuchsia/external/wpt/content-security-policy/child-src/child-src-cross-origin-load.sub-expected.txt

diff --git a/third_party/blink/web_tests/platform/fuchsia/external/wpt/content-security-policy/child-src/child-src-cross-origin-load.sub-expected.txt b/third_party/blink/web_tests/platform/fuchsia/external/wpt/content-security-policy/child-src/child-src-cross-origin-load.sub-expected.txt
new file mode 100644
index 0000000..a369027d
--- /dev/null
+++ b/third_party/blink/web_tests/platform/fuchsia/external/wpt/content-security-policy/child-src/child-src-cross-origin-load.sub-expected.txt
@@ -0,0 +1,5 @@
+This is a testharness.js-based test.
+PASS Expecting logs: ["PASS IFrame #1 generated a load event.","PASS IFrame #2 generated a load event.","PASS IFrame #3 generated a load event.", "violated-directive=frame-src"]
+PASS Expecting alerts: ["PASS","PASS"]
+Harness: the test ran to completion.
+

third_party/blink/web_tests/platform/linux/external/wpt/content-security-policy/child-src/child-src-cross-origin-load.sub-expected.txt

diff --git a/third_party/blink/web_tests/platform/linux/external/wpt/content-security-policy/child-src/child-src-cross-origin-load.sub-expected.txt b/third_party/blink/web_tests/platform/linux/external/wpt/content-security-policy/child-src/child-src-cross-origin-load.sub-expected.txt
new file mode 100644
index 0000000..a369027d
--- /dev/null
+++ b/third_party/blink/web_tests/platform/linux/external/wpt/content-security-policy/child-src/child-src-cross-origin-load.sub-expected.txt
@@ -0,0 +1,5 @@
+This is a testharness.js-based test.
+PASS Expecting logs: ["PASS IFrame #1 generated a load event.","PASS IFrame #2 generated a load event.","PASS IFrame #3 generated a load event.", "violated-directive=frame-src"]
+PASS Expecting alerts: ["PASS","PASS"]
+Harness: the test ran to completion.
+

third_party/blink/web_tests/platform/mac-mac10.12/external/wpt/content-security-policy/child-src/child-src-cross-origin-load.sub-expected.txt

diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/external/wpt/content-security-policy/child-src/child-src-cross-origin-load.sub-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.12/external/wpt/content-security-policy/child-src/child-src-cross-origin-load.sub-expected.txt
new file mode 100644
index 0000000..a369027d
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac10.12/external/wpt/content-security-policy/child-src/child-src-cross-origin-load.sub-expected.txt
@@ -0,0 +1,5 @@
+This is a testharness.js-based test.
+PASS Expecting logs: ["PASS IFrame #1 generated a load event.","PASS IFrame #2 generated a load event.","PASS IFrame #3 generated a load event.", "violated-directive=frame-src"]
+PASS Expecting alerts: ["PASS","PASS"]
+Harness: the test ran to completion.
+

third_party/blink/web_tests/platform/mac-mac10.12/fast/forms/color-scheme/media/video-overlay-menu-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/fast/forms/color-scheme/media/video-overlay-menu-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/fast/forms/color-scheme/media/video-overlay-menu-expected.png
index b1642de..88b0490b 100644
--- a/third_party/blink/web_tests/platform/mac-mac10.12/fast/forms/color-scheme/media/video-overlay-menu-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac10.12/fast/forms/color-scheme/media/video-overlay-menu-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac10.12/fast/forms/color-scheme/media/video-overlay-play-button-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/fast/forms/color-scheme/media/video-overlay-play-button-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/fast/forms/color-scheme/media/video-overlay-play-button-expected.png
index c995328..4c3c2aab 100644
--- a/third_party/blink/web_tests/platform/mac-mac10.12/fast/forms/color-scheme/media/video-overlay-play-button-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac10.12/fast/forms/color-scheme/media/video-overlay-play-button-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac10.12/fast/forms/text-control-intrinsic-widths-expected.txt

diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/fast/forms/text-control-intrinsic-widths-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.12/fast/forms/text-control-intrinsic-widths-expected.txt
deleted file mode 100644
index 384b29df..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/fast/forms/text-control-intrinsic-widths-expected.txt
+++ /dev/null
@@ -1,414 +0,0 @@
-This test measures the width of textareas and text inputs for different fonts.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-Lucida Grande
-input
-size=1 clientWidth=13
-size=2 clientWidth=21
-size=3 clientWidth=30
-size=4 clientWidth=38
-size=5 clientWidth=47
-size=10 clientWidth=89
-size=20 clientWidth=173
-size=50 clientWidth=426
-size=100 clientWidth=847
-size=500 clientWidth=4219
-size=1000 clientWidth=8433
-
-
-textarea
-cols=1 clientWidth=26
-cols=2 clientWidth=34
-cols=3 clientWidth=43
-cols=4 clientWidth=51
-cols=5 clientWidth=60
-cols=10 clientWidth=102
-cols=20 clientWidth=186
-cols=50 clientWidth=439
-cols=100 clientWidth=860
-cols=500 clientWidth=4232
-cols=1000 clientWidth=8446
-
-
-Courier
-input
-size=1 clientWidth=12
-size=2 clientWidth=20
-size=3 clientWidth=28
-size=4 clientWidth=36
-size=5 clientWidth=44
-size=10 clientWidth=84
-size=20 clientWidth=164
-size=50 clientWidth=404
-size=100 clientWidth=804
-size=500 clientWidth=4004
-size=1000 clientWidth=8004
-
-
-textarea
-cols=1 clientWidth=25
-cols=2 clientWidth=33
-cols=3 clientWidth=41
-cols=4 clientWidth=49
-cols=5 clientWidth=57
-cols=10 clientWidth=97
-cols=20 clientWidth=177
-cols=50 clientWidth=417
-cols=100 clientWidth=817
-cols=500 clientWidth=4017
-cols=1000 clientWidth=8017
-
-
-Helvetica
-input
-size=1 clientWidth=12
-size=2 clientWidth=19
-size=3 clientWidth=27
-size=4 clientWidth=34
-size=5 clientWidth=42
-size=10 clientWidth=79
-size=20 clientWidth=153
-size=50 clientWidth=375
-size=100 clientWidth=746
-size=500 clientWidth=3711
-size=1000 clientWidth=7418
-
-
-textarea
-cols=1 clientWidth=25
-cols=2 clientWidth=32
-cols=3 clientWidth=40
-cols=4 clientWidth=47
-cols=5 clientWidth=55
-cols=10 clientWidth=92
-cols=20 clientWidth=166
-cols=50 clientWidth=388
-cols=100 clientWidth=759
-cols=500 clientWidth=3724
-cols=1000 clientWidth=7431
-
-
-Monaco
-input
-size=1 clientWidth=12
-size=2 clientWidth=20
-size=3 clientWidth=28
-size=4 clientWidth=36
-size=5 clientWidth=44
-size=10 clientWidth=84
-size=20 clientWidth=164
-size=50 clientWidth=404
-size=100 clientWidth=804
-size=500 clientWidth=4004
-size=1000 clientWidth=8004
-
-
-textarea
-cols=1 clientWidth=25
-cols=2 clientWidth=33
-cols=3 clientWidth=41
-cols=4 clientWidth=49
-cols=5 clientWidth=57
-cols=10 clientWidth=97
-cols=20 clientWidth=177
-cols=50 clientWidth=417
-cols=100 clientWidth=817
-cols=500 clientWidth=4017
-cols=1000 clientWidth=8017
-
-
-Times
-input
-size=1 clientWidth=11
-size=2 clientWidth=18
-size=3 clientWidth=24
-size=4 clientWidth=31
-size=5 clientWidth=38
-size=10 clientWidth=71
-size=20 clientWidth=138
-size=50 clientWidth=338
-size=100 clientWidth=671
-size=500 clientWidth=3337
-size=1000 clientWidth=6669
-
-
-textarea
-cols=1 clientWidth=24
-cols=2 clientWidth=31
-cols=3 clientWidth=37
-cols=4 clientWidth=44
-cols=5 clientWidth=51
-cols=10 clientWidth=84
-cols=20 clientWidth=151
-cols=50 clientWidth=351
-cols=100 clientWidth=684
-cols=500 clientWidth=3350
-cols=1000 clientWidth=6682
-
-
-Andale Mono
-input
-size=1 clientWidth=16
-size=2 clientWidth=24
-size=3 clientWidth=32
-size=4 clientWidth=40
-size=5 clientWidth=48
-size=10 clientWidth=88
-size=20 clientWidth=168
-size=50 clientWidth=408
-size=100 clientWidth=808
-size=500 clientWidth=4008
-size=1000 clientWidth=8008
-
-
-textarea
-cols=1 clientWidth=25
-cols=2 clientWidth=33
-cols=3 clientWidth=41
-cols=4 clientWidth=49
-cols=5 clientWidth=57
-cols=10 clientWidth=97
-cols=20 clientWidth=177
-cols=50 clientWidth=417
-cols=100 clientWidth=817
-cols=500 clientWidth=4017
-cols=1000 clientWidth=8017
-
-
-Arial
-input
-size=1 clientWidth=16
-size=2 clientWidth=23
-size=3 clientWidth=30
-size=4 clientWidth=37
-size=5 clientWidth=44
-size=10 clientWidth=79
-size=20 clientWidth=149
-size=50 clientWidth=359
-size=100 clientWidth=709
-size=500 clientWidth=3509
-size=1000 clientWidth=7009
-
-
-textarea
-cols=1 clientWidth=24
-cols=2 clientWidth=31
-cols=3 clientWidth=38
-cols=4 clientWidth=45
-cols=5 clientWidth=52
-cols=10 clientWidth=87
-cols=20 clientWidth=157
-cols=50 clientWidth=367
-cols=100 clientWidth=717
-cols=500 clientWidth=3517
-cols=1000 clientWidth=7017
-
-
-Comic Sans MS
-input
-size=1 clientWidth=19
-size=2 clientWidth=27
-size=3 clientWidth=35
-size=4 clientWidth=43
-size=5 clientWidth=51
-size=10 clientWidth=91
-size=20 clientWidth=171
-size=50 clientWidth=411
-size=100 clientWidth=811
-size=500 clientWidth=4011
-size=1000 clientWidth=8011
-
-
-textarea
-cols=1 clientWidth=25
-cols=2 clientWidth=33
-cols=3 clientWidth=41
-cols=4 clientWidth=49
-cols=5 clientWidth=57
-cols=10 clientWidth=97
-cols=20 clientWidth=177
-cols=50 clientWidth=417
-cols=100 clientWidth=817
-cols=500 clientWidth=4017
-cols=1000 clientWidth=8017
-
-
-Courier New
-input
-size=1 clientWidth=15
-size=2 clientWidth=23
-size=3 clientWidth=31
-size=4 clientWidth=39
-size=5 clientWidth=47
-size=10 clientWidth=87
-size=20 clientWidth=167
-size=50 clientWidth=407
-size=100 clientWidth=807
-size=500 clientWidth=4007
-size=1000 clientWidth=8007
-
-
-textarea
-cols=1 clientWidth=25
-cols=2 clientWidth=33
-cols=3 clientWidth=41
-cols=4 clientWidth=49
-cols=5 clientWidth=57
-cols=10 clientWidth=97
-cols=20 clientWidth=177
-cols=50 clientWidth=417
-cols=100 clientWidth=817
-cols=500 clientWidth=4017
-cols=1000 clientWidth=8017
-
-
-Georgia
-input
-size=1 clientWidth=16
-size=2 clientWidth=23
-size=3 clientWidth=30
-size=4 clientWidth=37
-size=5 clientWidth=44
-size=10 clientWidth=79
-size=20 clientWidth=149
-size=50 clientWidth=359
-size=100 clientWidth=709
-size=500 clientWidth=3509
-size=1000 clientWidth=7009
-
-
-textarea
-cols=1 clientWidth=24
-cols=2 clientWidth=31
-cols=3 clientWidth=38
-cols=4 clientWidth=45
-cols=5 clientWidth=52
-cols=10 clientWidth=87
-cols=20 clientWidth=157
-cols=50 clientWidth=367
-cols=100 clientWidth=717
-cols=500 clientWidth=3517
-cols=1000 clientWidth=7017
-
-
-Times New Roman
-input
-size=1 clientWidth=16
-size=2 clientWidth=23
-size=3 clientWidth=30
-size=4 clientWidth=37
-size=5 clientWidth=44
-size=10 clientWidth=79
-size=20 clientWidth=149
-size=50 clientWidth=359
-size=100 clientWidth=709
-size=500 clientWidth=3509
-size=1000 clientWidth=7009
-
-
-textarea
-cols=1 clientWidth=24
-cols=2 clientWidth=31
-cols=3 clientWidth=38
-cols=4 clientWidth=45
-cols=5 clientWidth=52
-cols=10 clientWidth=87
-cols=20 clientWidth=157
-cols=50 clientWidth=367
-cols=100 clientWidth=717
-cols=500 clientWidth=3517
-cols=1000 clientWidth=7017
-
-
-Trebuchet MS
-input
-size=1 clientWidth=17
-size=2 clientWidth=24
-size=3 clientWidth=31
-size=4 clientWidth=38
-size=5 clientWidth=45
-size=10 clientWidth=80
-size=20 clientWidth=150
-size=50 clientWidth=360
-size=100 clientWidth=710
-size=500 clientWidth=3510
-size=1000 clientWidth=7010
-
-
-textarea
-cols=1 clientWidth=24
-cols=2 clientWidth=31
-cols=3 clientWidth=38
-cols=4 clientWidth=45
-cols=5 clientWidth=52
-cols=10 clientWidth=87
-cols=20 clientWidth=157
-cols=50 clientWidth=367
-cols=100 clientWidth=717
-cols=500 clientWidth=3517
-cols=1000 clientWidth=7017
-
-
-Verdana
-input
-size=1 clientWidth=17
-size=2 clientWidth=25
-size=3 clientWidth=33
-size=4 clientWidth=41
-size=5 clientWidth=49
-size=10 clientWidth=89
-size=20 clientWidth=169
-size=50 clientWidth=409
-size=100 clientWidth=809
-size=500 clientWidth=4009
-size=1000 clientWidth=8009
-
-
-textarea
-cols=1 clientWidth=25
-cols=2 clientWidth=33
-cols=3 clientWidth=41
-cols=4 clientWidth=49
-cols=5 clientWidth=57
-cols=10 clientWidth=97
-cols=20 clientWidth=177
-cols=50 clientWidth=417
-cols=100 clientWidth=817
-cols=500 clientWidth=4017
-cols=1000 clientWidth=8017
-
-
-Webdings
-input
-size=1 clientWidth=15
-size=2 clientWidth=23
-size=3 clientWidth=30
-size=4 clientWidth=37
-size=5 clientWidth=44
-size=10 clientWidth=79
-size=20 clientWidth=151
-size=50 clientWidth=364
-size=100 clientWidth=719
-size=500 clientWidth=3562
-size=1000 clientWidth=7116
-
-
-textarea
-cols=1 clientWidth=25
-cols=2 clientWidth=32
-cols=3 clientWidth=39
-cols=4 clientWidth=46
-cols=5 clientWidth=53
-cols=10 clientWidth=89
-cols=20 clientWidth=160
-cols=50 clientWidth=373
-cols=100 clientWidth=728
-cols=500 clientWidth=3571
-cols=1000 clientWidth=7125
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-

third_party/blink/web_tests/platform/mac-mac10.12/media/controls-after-reload-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/media/controls-after-reload-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/media/controls-after-reload-expected.png
index 110d54d..4e3eabe 100644
--- a/third_party/blink/web_tests/platform/mac-mac10.12/media/controls-after-reload-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac10.12/media/controls-after-reload-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac10.12/media/controls-strict-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/media/controls-strict-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/media/controls-strict-expected.png
index 8d3d001..ecb13b5 100644
--- a/third_party/blink/web_tests/platform/mac-mac10.12/media/controls-strict-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac10.12/media/controls-strict-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac10.12/media/controls-styling-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/media/controls-styling-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/media/controls-styling-expected.png
index 74e2734..13a484f 100644
--- a/third_party/blink/web_tests/platform/mac-mac10.12/media/controls-styling-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac10.12/media/controls-styling-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac10.12/media/controls-styling-strict-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/media/controls-styling-strict-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/media/controls-styling-strict-expected.png
index fb22df9d..4e49bbb 100644
--- a/third_party/blink/web_tests/platform/mac-mac10.12/media/controls-styling-strict-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac10.12/media/controls-styling-strict-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac10.12/media/controls-without-preload-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/media/controls-without-preload-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/media/controls-without-preload-expected.png
index d527675..619f8ff 100644
--- a/third_party/blink/web_tests/platform/mac-mac10.12/media/controls-without-preload-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac10.12/media/controls-without-preload-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac10.12/media/controls/paint-controls-webkit-appearance-none-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/media/controls/paint-controls-webkit-appearance-none-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/media/controls/paint-controls-webkit-appearance-none-expected.png
index 86333895..17f81f4 100644
--- a/third_party/blink/web_tests/platform/mac-mac10.12/media/controls/paint-controls-webkit-appearance-none-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac10.12/media/controls/paint-controls-webkit-appearance-none-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac10.12/media/track/track-cue-rendering-horizontal-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/media/track/track-cue-rendering-horizontal-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/media/track/track-cue-rendering-horizontal-expected.png
index 3a80aad5..9aec8473 100644
--- a/third_party/blink/web_tests/platform/mac-mac10.12/media/track/track-cue-rendering-horizontal-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac10.12/media/track/track-cue-rendering-horizontal-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac10.12/media/video-controls-rendering-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/media/video-controls-rendering-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/media/video-controls-rendering-expected.png
index 93e60a8..e8c9d46 100644
--- a/third_party/blink/web_tests/platform/mac-mac10.12/media/video-controls-rendering-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac10.12/media/video-controls-rendering-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac10.12/media/video-display-toggle-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/media/video-display-toggle-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/media/video-display-toggle-expected.png
index d82ecad..b0da671d 100644
--- a/third_party/blink/web_tests/platform/mac-mac10.12/media/video-display-toggle-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac10.12/media/video-display-toggle-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac10.12/media/video-no-audio-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/media/video-no-audio-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/media/video-no-audio-expected.png
index 8cc53d7..6560871 100644
--- a/third_party/blink/web_tests/platform/mac-mac10.12/media/video-no-audio-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac10.12/media/video-no-audio-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac10.12/media/video-zoom-controls-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/media/video-zoom-controls-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/media/video-zoom-controls-expected.png
index f181b5b..aac95f3 100644
--- a/third_party/blink/web_tests/platform/mac-mac10.12/media/video-zoom-controls-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac10.12/media/video-zoom-controls-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac10.12/virtual/controls-refresh-hc/fast/forms/color-scheme/media/video-overlay-menu-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/controls-refresh-hc/fast/forms/color-scheme/media/video-overlay-menu-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/controls-refresh-hc/fast/forms/color-scheme/media/video-overlay-menu-expected.png
index f4b05e7..3d657b1 100644
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/controls-refresh-hc/fast/forms/color-scheme/media/video-overlay-menu-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/controls-refresh-hc/fast/forms/color-scheme/media/video-overlay-menu-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac10.12/virtual/controls-refresh-hc/fast/forms/color-scheme/media/video-overlay-play-button-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/controls-refresh-hc/fast/forms/color-scheme/media/video-overlay-play-button-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/controls-refresh-hc/fast/forms/color-scheme/media/video-overlay-play-button-expected.png
index 684e6f5..d84fa7a15 100644
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/controls-refresh-hc/fast/forms/color-scheme/media/video-overlay-play-button-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/controls-refresh-hc/fast/forms/color-scheme/media/video-overlay-play-button-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac10.12/virtual/dark-color-scheme/fast/forms/color-scheme/media/video-overlay-menu-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/dark-color-scheme/fast/forms/color-scheme/media/video-overlay-menu-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/dark-color-scheme/fast/forms/color-scheme/media/video-overlay-menu-expected.png
index 1090b5b8..32be9c5 100644
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/dark-color-scheme/fast/forms/color-scheme/media/video-overlay-menu-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/dark-color-scheme/fast/forms/color-scheme/media/video-overlay-menu-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac10.12/virtual/dark-color-scheme/fast/forms/color-scheme/media/video-overlay-play-button-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/dark-color-scheme/fast/forms/color-scheme/media/video-overlay-play-button-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/dark-color-scheme/fast/forms/color-scheme/media/video-overlay-play-button-expected.png
index 0aa297f2..ed1f9cd 100644
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/dark-color-scheme/fast/forms/color-scheme/media/video-overlay-play-button-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/dark-color-scheme/fast/forms/color-scheme/media/video-overlay-play-button-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac10.12/virtual/dark-color-scheme/media/video-controls-rendering-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/dark-color-scheme/media/video-controls-rendering-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/dark-color-scheme/media/video-controls-rendering-expected.png
index 276fb57..2b78b1af 100644
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/dark-color-scheme/media/video-controls-rendering-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/dark-color-scheme/media/video-controls-rendering-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac10.12/virtual/delayed-animation-updates/external/wpt/css/css-transitions/transition-base-response-002-expected.txt

diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/delayed-animation-updates/external/wpt/css/css-transitions/transition-base-response-002-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/delayed-animation-updates/external/wpt/css/css-transitions/transition-base-response-002-expected.txt
new file mode 100644
index 0000000..51d58ef
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/delayed-animation-updates/external/wpt/css/css-transitions/transition-base-response-002-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+PASS Transitioning font-size on root affects rem units
+Harness: the test ran to completion.
+

third_party/blink/web_tests/platform/mac-mac10.12/wpt_internal/battery-status/multiple-promises-after-resolve-expected.txt

diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/wpt_internal/battery-status/multiple-promises-after-resolve-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.12/wpt_internal/battery-status/multiple-promises-after-resolve-expected.txt
new file mode 100644
index 0000000..1d3c6139
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac10.12/wpt_internal/battery-status/multiple-promises-after-resolve-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+PASS multiple consecutive invocations of navigator.getBattery()
+Harness: the test ran to completion.
+

third_party/blink/web_tests/platform/mac-mac10.13/compositing/overflow/nested-render-surfaces-with-rotation-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/compositing/overflow/nested-render-surfaces-with-rotation-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/compositing/overflow/nested-render-surfaces-with-rotation-expected.png
index b38235c..dc9db7c 100644
--- a/third_party/blink/web_tests/platform/mac-mac10.13/compositing/overflow/nested-render-surfaces-with-rotation-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac10.13/compositing/overflow/nested-render-surfaces-with-rotation-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac10.13/compositing/reflections/reflection-in-composited-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/compositing/reflections/reflection-in-composited-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/compositing/reflections/reflection-in-composited-expected.png
index 685f0df2..03d9b28 100644
--- a/third_party/blink/web_tests/platform/mac-mac10.13/compositing/reflections/reflection-in-composited-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac10.13/compositing/reflections/reflection-in-composited-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac10.13/external/wpt/content-security-policy/child-src/child-src-cross-origin-load.sub-expected.txt

diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/external/wpt/content-security-policy/child-src/child-src-cross-origin-load.sub-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.13/external/wpt/content-security-policy/child-src/child-src-cross-origin-load.sub-expected.txt
new file mode 100644
index 0000000..a369027d
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac10.13/external/wpt/content-security-policy/child-src/child-src-cross-origin-load.sub-expected.txt
@@ -0,0 +1,5 @@
+This is a testharness.js-based test.
+PASS Expecting logs: ["PASS IFrame #1 generated a load event.","PASS IFrame #2 generated a load event.","PASS IFrame #3 generated a load event.", "violated-directive=frame-src"]
+PASS Expecting alerts: ["PASS","PASS"]
+Harness: the test ran to completion.
+

third_party/blink/web_tests/platform/mac-mac10.13/http/tests/devtools/elements/node-xpath-expected.txt

diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/http/tests/devtools/elements/node-xpath-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.13/http/tests/devtools/elements/node-xpath-expected.txt
new file mode 100644
index 0000000..48e43b1
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac10.13/http/tests/devtools/elements/node-xpath-expected.txt
@@ -0,0 +1,25 @@
+Tests node xPath construction
+
+'#document':'' - '/' - '/'
+  '#comment':' Pre-comment ' - '/comment()[1]' - '/comment()[1]'
+  'html':'' - '/html' - '/html'
+    'head':'' - '/html/head' - '/html/head'
+      'script':'' - '/html/head/script' - '/html/head/script'
+        '#text':'\n// Comment\n//' - '/html/head/script/text()[1]' - '/html/head/script/text()[1]'
+        '#cdata-section':'\nfunction f()\n{\n    document.write("<");\n}\n//' - '/html/head/script/text()[2]' - '/html/head/script/text()[2]'
+    'body':'' - '/html/body' - '/html/body'
+      'div':'' - '//*[@id="id1"]' - '/html/body/div[1]'
+      'div':'' - '//*[@id="id2"]' - '/html/body/div[2]'
+      'div':'' - '//*[@id="container"]' - '/html/body/div[3]'
+        'div':'' - '//*[@id="id3"]' - '/html/body/div[3]/div[1]'
+          '#text':'3 Prefix ' - '//*[@id="id3"]/text()[1]' - '/html/body/div[3]/div[1]/text()[1]'
+          '#cdata-section':'<greeting>Hello, world!</greeting>' - '//*[@id="id3"]/text()[2]' - '/html/body/div[3]/div[1]/text()[2]'
+          '#text':' Suffix' - '//*[@id="id3"]/text()[3]' - '/html/body/div[3]/div[1]/text()[3]'
+        'div':'' - '//*[@id="id4"]' - '/html/body/div[3]/div[2]'
+          '#text':'4' - '//*[@id="id4"]/text()' - '/html/body/div[3]/div[2]/text()'
+        'div':'' - '//*[@id="id5"]' - '/html/body/div[3]/div[3]'
+          '#text':'5' - '//*[@id="id5"]/text()' - '/html/body/div[3]/div[3]/text()'
+        'div':'' - '//*[@id="id6"]' - '/html/body/div[3]/div[4]'
+          '#text':'6' - '//*[@id="id6"]/text()' - '/html/body/div[3]/div[4]/text()'
+  '#comment':' Post-comment ' - '/comment()[2]' - '/comment()[2]'
+

third_party/blink/web_tests/platform/mac-mac10.13/virtual/backface-visibility-interop/compositing/overflow/nested-render-surfaces-with-rotation-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/backface-visibility-interop/compositing/overflow/nested-render-surfaces-with-rotation-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/backface-visibility-interop/compositing/overflow/nested-render-surfaces-with-rotation-expected.png
new file mode 100644
index 0000000..dc9db7c
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/backface-visibility-interop/compositing/overflow/nested-render-surfaces-with-rotation-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac10.13/virtual/delayed-animation-updates/external/wpt/css/css-transitions/transition-base-response-002-expected.txt

diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/delayed-animation-updates/external/wpt/css/css-transitions/transition-base-response-002-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/delayed-animation-updates/external/wpt/css/css-transitions/transition-base-response-002-expected.txt
new file mode 100644
index 0000000..51d58ef
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/delayed-animation-updates/external/wpt/css/css-transitions/transition-base-response-002-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+PASS Transitioning font-size on root affects rem units
+Harness: the test ran to completion.
+

third_party/blink/web_tests/platform/mac-mac10.13/wpt_internal/battery-status/multiple-promises-after-resolve-expected.txt

diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/wpt_internal/battery-status/multiple-promises-after-resolve-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.13/wpt_internal/battery-status/multiple-promises-after-resolve-expected.txt
new file mode 100644
index 0000000..1d3c6139
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac10.13/wpt_internal/battery-status/multiple-promises-after-resolve-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+PASS multiple consecutive invocations of navigator.getBattery()
+Harness: the test ran to completion.
+

third_party/blink/web_tests/platform/mac-mac10.14/external/wpt/content-security-policy/child-src/child-src-cross-origin-load.sub-expected.txt

diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/external/wpt/content-security-policy/child-src/child-src-cross-origin-load.sub-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.14/external/wpt/content-security-policy/child-src/child-src-cross-origin-load.sub-expected.txt
new file mode 100644
index 0000000..a369027d
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac10.14/external/wpt/content-security-policy/child-src/child-src-cross-origin-load.sub-expected.txt
@@ -0,0 +1,5 @@
+This is a testharness.js-based test.
+PASS Expecting logs: ["PASS IFrame #1 generated a load event.","PASS IFrame #2 generated a load event.","PASS IFrame #3 generated a load event.", "violated-directive=frame-src"]
+PASS Expecting alerts: ["PASS","PASS"]
+Harness: the test ran to completion.
+

third_party/blink/web_tests/platform/mac-mac10.14/fast/forms/color-scheme/media/video-overlay-menu-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/fast/forms/color-scheme/media/video-overlay-menu-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/fast/forms/color-scheme/media/video-overlay-menu-expected.png
index c1c4f39e5..cdb8b26 100644
--- a/third_party/blink/web_tests/platform/mac-mac10.14/fast/forms/color-scheme/media/video-overlay-menu-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac10.14/fast/forms/color-scheme/media/video-overlay-menu-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac10.14/fast/forms/color-scheme/media/video-overlay-play-button-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/fast/forms/color-scheme/media/video-overlay-play-button-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/fast/forms/color-scheme/media/video-overlay-play-button-expected.png
index 27d9a69..b5401ae 100644
--- a/third_party/blink/web_tests/platform/mac-mac10.14/fast/forms/color-scheme/media/video-overlay-play-button-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac10.14/fast/forms/color-scheme/media/video-overlay-play-button-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac10.14/http/tests/devtools/elements/node-xpath-expected.txt

diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/http/tests/devtools/elements/node-xpath-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.14/http/tests/devtools/elements/node-xpath-expected.txt
new file mode 100644
index 0000000..c16e55f
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac10.14/http/tests/devtools/elements/node-xpath-expected.txt
@@ -0,0 +1,9 @@
+Tests node xPath construction
+
+'#document':'' - '/' - '/'
+  '#comment':' Pre-comment ' - '/comment()[1]' - '/comment()[1]'
+  'html':'' - '/html' - '/html'
+    'head':'' - '/html/head' - '/html/head'
+    'body':'' - '/html/body' - '/html/body'
+  '#comment':' Post-comment ' - '/comment()[2]' - '/comment()[2]'
+

third_party/blink/web_tests/platform/mac-mac10.14/media/controls-after-reload-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/media/controls-after-reload-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/media/controls-after-reload-expected.png
index a85412f..258e2fd 100644
--- a/third_party/blink/web_tests/platform/mac-mac10.14/media/controls-after-reload-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac10.14/media/controls-after-reload-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac10.14/media/controls-strict-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/media/controls-strict-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/media/controls-strict-expected.png
index 0282f7c..9bcf30c 100644
--- a/third_party/blink/web_tests/platform/mac-mac10.14/media/controls-strict-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac10.14/media/controls-strict-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac10.14/media/controls-styling-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/media/controls-styling-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/media/controls-styling-expected.png
index 4d576a99..464df37 100644
--- a/third_party/blink/web_tests/platform/mac-mac10.14/media/controls-styling-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac10.14/media/controls-styling-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac10.14/media/controls-styling-strict-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/media/controls-styling-strict-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/media/controls-styling-strict-expected.png
index 321055a..c0aa22a 100644
--- a/third_party/blink/web_tests/platform/mac-mac10.14/media/controls-styling-strict-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac10.14/media/controls-styling-strict-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac10.14/media/controls-without-preload-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/media/controls-without-preload-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/media/controls-without-preload-expected.png
index 353492c..2e526dc9f 100644
--- a/third_party/blink/web_tests/platform/mac-mac10.14/media/controls-without-preload-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac10.14/media/controls-without-preload-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac10.14/media/controls/paint-controls-webkit-appearance-none-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/media/controls/paint-controls-webkit-appearance-none-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/media/controls/paint-controls-webkit-appearance-none-expected.png
index a0eb1bd0..bd3fafe7 100644
--- a/third_party/blink/web_tests/platform/mac-mac10.14/media/controls/paint-controls-webkit-appearance-none-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac10.14/media/controls/paint-controls-webkit-appearance-none-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac10.14/media/track/track-cue-rendering-horizontal-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/media/track/track-cue-rendering-horizontal-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/media/track/track-cue-rendering-horizontal-expected.png
index 1a96aa87..faa69b91 100644
--- a/third_party/blink/web_tests/platform/mac-mac10.14/media/track/track-cue-rendering-horizontal-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac10.14/media/track/track-cue-rendering-horizontal-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac10.14/media/track/track-cue-rendering-vertical-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/media/track/track-cue-rendering-vertical-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/media/track/track-cue-rendering-vertical-expected.png
index 2d321a90..2c512591 100644
--- a/third_party/blink/web_tests/platform/mac-mac10.14/media/track/track-cue-rendering-vertical-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac10.14/media/track/track-cue-rendering-vertical-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac10.14/media/video-controls-rendering-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/media/video-controls-rendering-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/media/video-controls-rendering-expected.png
index dc7208f..4b9e39c 100644
--- a/third_party/blink/web_tests/platform/mac-mac10.14/media/video-controls-rendering-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac10.14/media/video-controls-rendering-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac10.14/media/video-display-toggle-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/media/video-display-toggle-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/media/video-display-toggle-expected.png
index a42e45b..75bd6df 100644
--- a/third_party/blink/web_tests/platform/mac-mac10.14/media/video-display-toggle-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac10.14/media/video-display-toggle-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac10.14/media/video-no-audio-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/media/video-no-audio-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/media/video-no-audio-expected.png
index bc66ff2..152f165 100644
--- a/third_party/blink/web_tests/platform/mac-mac10.14/media/video-no-audio-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac10.14/media/video-no-audio-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac10.14/virtual/controls-refresh-hc/fast/forms/color-scheme/media/video-overlay-menu-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/controls-refresh-hc/fast/forms/color-scheme/media/video-overlay-menu-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/controls-refresh-hc/fast/forms/color-scheme/media/video-overlay-menu-expected.png
index a91dd17..bb8e6934 100644
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/controls-refresh-hc/fast/forms/color-scheme/media/video-overlay-menu-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/controls-refresh-hc/fast/forms/color-scheme/media/video-overlay-menu-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac10.14/virtual/controls-refresh-hc/fast/forms/color-scheme/media/video-overlay-play-button-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/controls-refresh-hc/fast/forms/color-scheme/media/video-overlay-play-button-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/controls-refresh-hc/fast/forms/color-scheme/media/video-overlay-play-button-expected.png
index 6b9a591..57bedf5 100644
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/controls-refresh-hc/fast/forms/color-scheme/media/video-overlay-play-button-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/controls-refresh-hc/fast/forms/color-scheme/media/video-overlay-play-button-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac10.14/virtual/dark-color-scheme/fast/forms/color-scheme/media/video-overlay-menu-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/dark-color-scheme/fast/forms/color-scheme/media/video-overlay-menu-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/dark-color-scheme/fast/forms/color-scheme/media/video-overlay-menu-expected.png
index d179d3c..2090148 100644
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/dark-color-scheme/fast/forms/color-scheme/media/video-overlay-menu-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/dark-color-scheme/fast/forms/color-scheme/media/video-overlay-menu-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac10.14/virtual/dark-color-scheme/fast/forms/color-scheme/media/video-overlay-play-button-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/dark-color-scheme/fast/forms/color-scheme/media/video-overlay-play-button-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/dark-color-scheme/fast/forms/color-scheme/media/video-overlay-play-button-expected.png
index 5c806c3..286395e 100644
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/dark-color-scheme/fast/forms/color-scheme/media/video-overlay-play-button-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/dark-color-scheme/fast/forms/color-scheme/media/video-overlay-play-button-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac10.14/virtual/dark-color-scheme/media/video-controls-rendering-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/dark-color-scheme/media/video-controls-rendering-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/dark-color-scheme/media/video-controls-rendering-expected.png
index 82a8ad6..4aeacc3 100644
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/dark-color-scheme/media/video-controls-rendering-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/dark-color-scheme/media/video-controls-rendering-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac10.14/virtual/delayed-animation-updates/external/wpt/css/css-transitions/transition-base-response-002-expected.txt

diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/delayed-animation-updates/external/wpt/css/css-transitions/transition-base-response-002-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/delayed-animation-updates/external/wpt/css/css-transitions/transition-base-response-002-expected.txt
new file mode 100644
index 0000000..51d58ef
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/delayed-animation-updates/external/wpt/css/css-transitions/transition-base-response-002-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+PASS Transitioning font-size on root affects rem units
+Harness: the test ran to completion.
+

third_party/blink/web_tests/platform/mac-mac10.14/virtual/exotic-color-space/images/color-profile-image-filter-all-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/exotic-color-space/images/color-profile-image-filter-all-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/exotic-color-space/images/color-profile-image-filter-all-expected.png
index 96e283a..ff6953a 100644
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/exotic-color-space/images/color-profile-image-filter-all-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/exotic-color-space/images/color-profile-image-filter-all-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac10.14/virtual/gpu-rasterization/images/color-profile-image-filter-all-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/gpu-rasterization/images/color-profile-image-filter-all-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/gpu-rasterization/images/color-profile-image-filter-all-expected.png
index 362ea88..eb03df1 100644
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/gpu-rasterization/images/color-profile-image-filter-all-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/gpu-rasterization/images/color-profile-image-filter-all-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac10.14/wpt_internal/battery-status/multiple-promises-after-resolve-expected.txt

diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/wpt_internal/battery-status/multiple-promises-after-resolve-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.14/wpt_internal/battery-status/multiple-promises-after-resolve-expected.txt
new file mode 100644
index 0000000..1d3c6139
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac10.14/wpt_internal/battery-status/multiple-promises-after-resolve-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+PASS multiple consecutive invocations of navigator.getBattery()
+Harness: the test ran to completion.
+

third_party/blink/web_tests/platform/mac-mac10.15/external/wpt/content-security-policy/child-src/child-src-cross-origin-load.sub-expected.txt

diff --git a/third_party/blink/web_tests/platform/mac-mac10.15/external/wpt/content-security-policy/child-src/child-src-cross-origin-load.sub-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.15/external/wpt/content-security-policy/child-src/child-src-cross-origin-load.sub-expected.txt
new file mode 100644
index 0000000..a369027d
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac10.15/external/wpt/content-security-policy/child-src/child-src-cross-origin-load.sub-expected.txt
@@ -0,0 +1,5 @@
+This is a testharness.js-based test.
+PASS Expecting logs: ["PASS IFrame #1 generated a load event.","PASS IFrame #2 generated a load event.","PASS IFrame #3 generated a load event.", "violated-directive=frame-src"]
+PASS Expecting alerts: ["PASS","PASS"]
+Harness: the test ran to completion.
+

third_party/blink/web_tests/platform/mac-mac10.15/plugins/refcount-leaks-expected.txt

diff --git a/third_party/blink/web_tests/platform/mac-mac10.15/plugins/refcount-leaks-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.15/plugins/refcount-leaks-expected.txt
new file mode 100644
index 0000000..ce7d164c
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac10.15/plugins/refcount-leaks-expected.txt
@@ -0,0 +1,10 @@
+Test that we can get an NPObject returned through a method on an NPAPI Object.
+
+Prints "SUCCESS" on success, "FAILURE" on failure. 
+
+--- num test objects:
+countAfterCreate == countOrig + 3? PASS
+countOrig == countAfterGC? PASS
+countOrig == countAfterGC2? PASS
+
+SUCCESS

third_party/blink/web_tests/platform/mac-mac10.15/virtual/delayed-animation-updates/external/wpt/css/css-transitions/transition-base-response-002-expected.txt

diff --git a/third_party/blink/web_tests/platform/mac-mac10.15/virtual/delayed-animation-updates/external/wpt/css/css-transitions/transition-base-response-002-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.15/virtual/delayed-animation-updates/external/wpt/css/css-transitions/transition-base-response-002-expected.txt
new file mode 100644
index 0000000..51d58ef
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac10.15/virtual/delayed-animation-updates/external/wpt/css/css-transitions/transition-base-response-002-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+PASS Transitioning font-size on root affects rem units
+Harness: the test ran to completion.
+

third_party/blink/web_tests/platform/mac-mac10.15/webexposed/global-interface-listing-platform-specific-expected.txt

diff --git a/third_party/blink/web_tests/platform/mac-mac10.15/webexposed/global-interface-listing-platform-specific-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.15/webexposed/global-interface-listing-platform-specific-expected.txt
new file mode 100644
index 0000000..c4d6a2e2
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac10.15/webexposed/global-interface-listing-platform-specific-expected.txt
@@ -0,0 +1,102 @@
+This test documents all interface attributes and methods on the global window object and element instances.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+[INTERFACES]
+interface BarcodeDetector
+    static method getSupportedFormats
+    attribute @@toStringTag
+    method constructor
+    method detect
+interface Bluetooth : EventTarget
+    attribute @@toStringTag
+    getter onadvertisementreceived
+    method constructor
+    method getAvailability
+    method getDevices
+    method requestDevice
+    method requestLEScan
+    setter onadvertisementreceived
+interface BluetoothCharacteristicProperties
+    attribute @@toStringTag
+    getter authenticatedSignedWrites
+    getter broadcast
+    getter indicate
+    getter notify
+    getter read
+    getter reliableWrite
+    getter writableAuxiliaries
+    getter write
+    getter writeWithoutResponse
+    method constructor
+interface BluetoothDevice : EventTarget
+    attribute @@toStringTag
+    getter gatt
+    getter id
+    getter name
+    getter onadvertisementreceived
+    getter ongattserverdisconnected
+    getter watchingAdvertisements
+    method constructor
+    method watchAdvertisements
+    setter onadvertisementreceived
+    setter ongattserverdisconnected
+interface BluetoothRemoteGATTCharacteristic : EventTarget
+    attribute @@toStringTag
+    getter oncharacteristicvaluechanged
+    getter properties
+    getter service
+    getter uuid
+    getter value
+    method constructor
+    method getDescriptor
+    method getDescriptors
+    method readValue
+    method startNotifications
+    method stopNotifications
+    method writeValue
+    method writeValueWithResponse
+    method writeValueWithoutResponse
+    setter oncharacteristicvaluechanged
+interface BluetoothRemoteGATTDescriptor
+    attribute @@toStringTag
+    getter characteristic
+    getter uuid
+    getter value
+    method constructor
+    method readValue
+    method writeValue
+interface BluetoothRemoteGATTServer
+    attribute @@toStringTag
+    getter connected
+    getter device
+    method connect
+    method constructor
+    method disconnect
+    method getPrimaryService
+    method getPrimaryServices
+interface BluetoothRemoteGATTService
+    attribute @@toStringTag
+    getter device
+    getter isPrimary
+    getter uuid
+    method constructor
+    method getCharacteristic
+    method getCharacteristics
+interface BluetoothUUID
+    static method canonicalUUID
+    static method getCharacteristic
+    static method getDescriptor
+    static method getService
+    attribute @@toStringTag
+    method constructor
+interface Navigator
+    getter bluetooth
+interface Notification : EventTarget
+    getter image
+[NAMESPACES]
+[GLOBAL OBJECT]
+PASS successfullyParsed is true
+
+TEST COMPLETE
+

third_party/blink/web_tests/platform/mac-mac10.15/wpt_internal/battery-status/multiple-promises-after-resolve-expected.txt

diff --git a/third_party/blink/web_tests/platform/mac-mac10.15/wpt_internal/battery-status/multiple-promises-after-resolve-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.15/wpt_internal/battery-status/multiple-promises-after-resolve-expected.txt
new file mode 100644
index 0000000..1d3c6139
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac10.15/wpt_internal/battery-status/multiple-promises-after-resolve-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+PASS multiple consecutive invocations of navigator.getBattery()
+Harness: the test ran to completion.
+

third_party/blink/web_tests/platform/mac-mac11-arm64/compositing/direct-image-compositing-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/compositing/direct-image-compositing-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/compositing/direct-image-compositing-expected.png
index 9373151..6ffe9f5 100644
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/compositing/direct-image-compositing-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/compositing/direct-image-compositing-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/compositing/geometry/video-fixed-scrolling-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/compositing/geometry/video-fixed-scrolling-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/compositing/geometry/video-fixed-scrolling-expected.png
new file mode 100644
index 0000000..7c38e58
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/compositing/geometry/video-fixed-scrolling-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/compositing/geometry/video-opacity-overlay-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/compositing/geometry/video-opacity-overlay-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/compositing/geometry/video-opacity-overlay-expected.png
new file mode 100644
index 0000000..b1d7a7e0
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/compositing/geometry/video-opacity-overlay-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/compositing/video/video-controls-squashing-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/compositing/video/video-controls-squashing-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/compositing/video/video-controls-squashing-expected.png
new file mode 100644
index 0000000..81c6858
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/compositing/video/video-controls-squashing-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/external/wpt/content-security-policy/child-src/child-src-cross-origin-load.sub-expected.txt

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/external/wpt/content-security-policy/child-src/child-src-cross-origin-load.sub-expected.txt b/third_party/blink/web_tests/platform/mac-mac11-arm64/external/wpt/content-security-policy/child-src/child-src-cross-origin-load.sub-expected.txt
new file mode 100644
index 0000000..a369027d
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/external/wpt/content-security-policy/child-src/child-src-cross-origin-load.sub-expected.txt
@@ -0,0 +1,5 @@
+This is a testharness.js-based test.
+PASS Expecting logs: ["PASS IFrame #1 generated a load event.","PASS IFrame #2 generated a load event.","PASS IFrame #3 generated a load event.", "violated-directive=frame-src"]
+PASS Expecting alerts: ["PASS","PASS"]
+Harness: the test ran to completion.
+

third_party/blink/web_tests/platform/mac-mac11-arm64/http/tests/intersection-observer/cross-origin-iframe-with-nesting-expected.txt

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/http/tests/intersection-observer/cross-origin-iframe-with-nesting-expected.txt b/third_party/blink/web_tests/platform/mac-mac11-arm64/http/tests/intersection-observer/cross-origin-iframe-with-nesting-expected.txt
new file mode 100644
index 0000000..3428b56
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/http/tests/intersection-observer/cross-origin-iframe-with-nesting-expected.txt
@@ -0,0 +1,8 @@
+This is a testharness.js-based test.
+PASS Intersection observer test with target in nested cross-origin subframes, potentially rendered in other processes.
+PASS First rAF
+PASS topDocument.scrollingElement.scrollTop = 200
+PASS iframeDocument.scrollingElement.scrollTop = 250
+FAIL topDocument.scrollingElement.scrollTop = 100 assert_equals: expected 1 but got 0
+Harness: the test ran to completion.
+

third_party/blink/web_tests/platform/mac-mac11-arm64/media/color-profile-video-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/media/color-profile-video-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/media/color-profile-video-expected.png
new file mode 100644
index 0000000..3a47eb0
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/media/color-profile-video-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/media/color-profile-video-seek-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/media/color-profile-video-seek-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/media/color-profile-video-seek-expected.png
new file mode 100644
index 0000000..2beecccd
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/media/color-profile-video-seek-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/media/controls/video-overlay-cast-light-rendering-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/media/controls/video-overlay-cast-light-rendering-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/media/controls/video-overlay-cast-light-rendering-expected.png
new file mode 100644
index 0000000..f8da6ce
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/media/controls/video-overlay-cast-light-rendering-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/media/picture-in-picture/v2/request-picture-in-picture-twice-expected.txt

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/media/picture-in-picture/v2/request-picture-in-picture-twice-expected.txt b/third_party/blink/web_tests/platform/mac-mac11-arm64/media/picture-in-picture/v2/request-picture-in-picture-twice-expected.txt
new file mode 100644
index 0000000..67629455
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/media/picture-in-picture/v2/request-picture-in-picture-twice-expected.txt
@@ -0,0 +1,5 @@
+This is a testharness.js-based test.
+FAIL request Picture-in-Picture consumes user gesture promise_test: Unhandled rejection with value: object "TypeError: element1.requestPictureInPicture is not a function"
+FAIL request Picture-in-Picture does not require user gesture if document.pictureInPictureElement is set promise_test: Unhandled rejection with value: object "TypeError: element.requestPictureInPicture is not a function"
+Harness: the test ran to completion.
+

third_party/blink/web_tests/platform/mac-mac11-arm64/media/video-zoom-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/media/video-zoom-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/media/video-zoom-expected.png
new file mode 100644
index 0000000..2aa7c93
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/media/video-zoom-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/backface-visibility-interop/compositing/geometry/video-fixed-scrolling-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/backface-visibility-interop/compositing/geometry/video-fixed-scrolling-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/backface-visibility-interop/compositing/geometry/video-fixed-scrolling-expected.png
new file mode 100644
index 0000000..7c38e58
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/backface-visibility-interop/compositing/geometry/video-fixed-scrolling-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/backface-visibility-interop/compositing/geometry/video-opacity-overlay-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/backface-visibility-interop/compositing/geometry/video-opacity-overlay-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/backface-visibility-interop/compositing/geometry/video-opacity-overlay-expected.png
new file mode 100644
index 0000000..b1d7a7e0
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/backface-visibility-interop/compositing/geometry/video-opacity-overlay-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/delayed-animation-updates/external/wpt/css/css-transitions/transition-base-response-002-expected.txt

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/delayed-animation-updates/external/wpt/css/css-transitions/transition-base-response-002-expected.txt b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/delayed-animation-updates/external/wpt/css/css-transitions/transition-base-response-002-expected.txt
new file mode 100644
index 0000000..51d58ef
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/delayed-animation-updates/external/wpt/css/css-transitions/transition-base-response-002-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+PASS Transitioning font-size on root affects rem units
+Harness: the test ran to completion.
+

third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/2-comp-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/2-comp-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/2-comp-expected.png
index b14398f..a374be2 100644
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/2-comp-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/2-comp-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-jpeg-with-color-profile-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-jpeg-with-color-profile-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-jpeg-with-color-profile-expected.png
new file mode 100644
index 0000000..9ce55d0
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-jpeg-with-color-profile-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-animate-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-animate-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-animate-expected.png
new file mode 100644
index 0000000..901c67d7
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-animate-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-animate-rotate-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-animate-rotate-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-animate-rotate-expected.png
new file mode 100644
index 0000000..158dab43
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-animate-rotate-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-background-image-cover-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-background-image-cover-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-background-image-cover-expected.png
new file mode 100644
index 0000000..72cdd88
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-background-image-cover-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-border-image-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-border-image-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-border-image-expected.png
index e7243dd..72a36a5d 100644
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-border-image-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-border-image-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-group-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-group-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-group-expected.png
index 6ccde04..6861bea 100644
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-group-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-group-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-image-canvas-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-image-canvas-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-image-canvas-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-image-canvas-expected.png
rename to third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-image-canvas-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-image-canvas-pattern-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-image-canvas-pattern-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-image-canvas-pattern-expected.png
new file mode 100644
index 0000000..097db4f0
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-image-canvas-pattern-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-image-canvas-svg-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-image-canvas-svg-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-image-canvas-svg-expected.png
new file mode 100644
index 0000000..a7077c9
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-image-canvas-svg-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-image-filter-all-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-image-filter-all-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-image-filter-all-expected.png
index f29c0cb..1bad830 100644
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-image-filter-all-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-image-filter-all-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-image-object-fit-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-image-object-fit-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-image-object-fit-expected.png
new file mode 100644
index 0000000..cc9d7dd5
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-image-object-fit-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-image-shape-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-image-shape-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-image-shape-expected.png
new file mode 100644
index 0000000..2926977
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-image-shape-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-image-svg-resource-url-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-image-svg-resource-url-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-image-svg-resource-url-expected.png
new file mode 100644
index 0000000..ed74466a
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-image-svg-resource-url-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-mask-image-svg-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-mask-image-svg-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-mask-image-svg-expected.png
new file mode 100644
index 0000000..ebcacc4
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-mask-image-svg-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-object-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-object-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-object-expected.png
new file mode 100644
index 0000000..495e903
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/color-profile-object-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/jpeg-with-color-profile-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/jpeg-with-color-profile-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/jpeg-with-color-profile-expected.png
new file mode 100644
index 0000000..ac8608c
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/jpeg-with-color-profile-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/jpeg-yuv-progressive-canvas-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/jpeg-yuv-progressive-canvas-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/jpeg-yuv-progressive-canvas-expected.png
index ffa89d0..f3c5b79 100644
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/jpeg-yuv-progressive-canvas-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/jpeg-yuv-progressive-canvas-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/jpeg-yuv-progressive-image-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/jpeg-yuv-progressive-image-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/jpeg-yuv-progressive-image-expected.png
index aba1ceb0..52c4d1ec8 100644
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/jpeg-yuv-progressive-image-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/jpeg-yuv-progressive-image-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/motion-jpeg-single-frame-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/motion-jpeg-single-frame-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/motion-jpeg-single-frame-expected.png
index fc1c743..92e75a67 100644
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/motion-jpeg-single-frame-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/motion-jpeg-single-frame-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/png-with-color-profile-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/png-with-color-profile-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/png-with-color-profile-expected.png
new file mode 100644
index 0000000..8f05ae5
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/png-with-color-profile-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/rgb-jpeg-with-adobe-marker-only-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/rgb-jpeg-with-adobe-marker-only-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/rgb-jpeg-with-adobe-marker-only-expected.png
index 84acdcc..a6a20ae9 100644
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/rgb-jpeg-with-adobe-marker-only-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/rgb-jpeg-with-adobe-marker-only-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/webp-color-profile-lossless-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/webp-color-profile-lossless-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/webp-color-profile-lossless-expected.png
new file mode 100644
index 0000000..58dbc3e
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/webp-color-profile-lossless-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-border-radius-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-border-radius-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-border-radius-expected.png
new file mode 100644
index 0000000..bd0e5ec
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-border-radius-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-filter-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-filter-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-filter-expected.png
index 07611843..11c835a 100644
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-filter-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-filter-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-image-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-image-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-image-expected.png
new file mode 100644
index 0000000..4930d58
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-image-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-layer-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-layer-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-layer-expected.png
new file mode 100644
index 0000000..d6f21d2b0
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-layer-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-layer-filter-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-layer-filter-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-layer-filter-expected.png
new file mode 100644
index 0000000..41e27e2
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-layer-filter-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/yuv-decode-eligible/webp-color-profile-lossy-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/yuv-decode-eligible/webp-color-profile-lossy-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/yuv-decode-eligible/webp-color-profile-lossy-expected.png
new file mode 100644
index 0000000..890a5dc0
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/yuv-decode-eligible/webp-color-profile-lossy-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/yuv-decode-eligible/webp-no-color-profile-lossy-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/yuv-decode-eligible/webp-no-color-profile-lossy-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/yuv-decode-eligible/webp-no-color-profile-lossy-expected.png
index a1e7493..5d06d3b7 100644
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/yuv-decode-eligible/webp-no-color-profile-lossy-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/exotic-color-space/images/yuv-decode-eligible/webp-no-color-profile-lossy-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/gpu-rasterization/images/2-comp-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/gpu-rasterization/images/2-comp-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/gpu-rasterization/images/2-comp-expected.png
new file mode 100644
index 0000000..63e409c
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/gpu-rasterization/images/2-comp-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/gpu-rasterization/images/color-profile-background-image-cover-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/gpu-rasterization/images/color-profile-background-image-cover-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/gpu-rasterization/images/color-profile-background-image-cover-expected.png
new file mode 100644
index 0000000..da14a0e
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/gpu-rasterization/images/color-profile-background-image-cover-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/gpu-rasterization/images/color-profile-background-image-cross-fade-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/gpu-rasterization/images/color-profile-background-image-cross-fade-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/gpu-rasterization/images/color-profile-background-image-cross-fade-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/mac-mac10.14/virtual/gpu-rasterization/images/color-profile-background-image-cross-fade-expected.png
rename to third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/gpu-rasterization/images/color-profile-background-image-cross-fade-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/gpu-rasterization/images/color-profile-background-image-repeat-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/gpu-rasterization/images/color-profile-background-image-repeat-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/gpu-rasterization/images/color-profile-background-image-repeat-expected.png
new file mode 100644
index 0000000..890d278e
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/gpu-rasterization/images/color-profile-background-image-repeat-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/gpu-rasterization/images/color-profile-background-image-space-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/gpu-rasterization/images/color-profile-background-image-space-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/gpu-rasterization/images/color-profile-background-image-space-expected.png
new file mode 100644
index 0000000..7d74fd8
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/gpu-rasterization/images/color-profile-background-image-space-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/gpu-rasterization/images/color-profile-image-filter-all-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/gpu-rasterization/images/color-profile-image-filter-all-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/gpu-rasterization/images/color-profile-image-filter-all-expected.png
new file mode 100644
index 0000000..fbdd0e7a
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/gpu-rasterization/images/color-profile-image-filter-all-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-filter-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-filter-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-filter-expected.png
new file mode 100644
index 0000000..204a5ac
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-filter-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-image-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-image-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-image-expected.png
new file mode 100644
index 0000000..c266fbe
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-image-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/scalefactor200/css3/filters/effect-reference-colorspace-hw-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/scalefactor200/css3/filters/effect-reference-colorspace-hw-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/scalefactor200/css3/filters/effect-reference-colorspace-hw-expected.png
new file mode 100644
index 0000000..c3dbefa
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/scalefactor200/css3/filters/effect-reference-colorspace-hw-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/scalefactor200/css3/filters/effect-reference-hw-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/scalefactor200/css3/filters/effect-reference-hw-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/scalefactor200/css3/filters/effect-reference-hw-expected.png
new file mode 100644
index 0000000..d416460
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/scalefactor200/css3/filters/effect-reference-hw-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/scalefactor200/external/wpt/largest-contentful-paint/repeated-image-expected.txt

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/scalefactor200/external/wpt/largest-contentful-paint/repeated-image-expected.txt b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/scalefactor200/external/wpt/largest-contentful-paint/repeated-image-expected.txt
new file mode 100644
index 0000000..fa7db36
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/scalefactor200/external/wpt/largest-contentful-paint/repeated-image-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+PASS Repeated image produces different timestamps.
+Harness: the test ran to completion.
+

third_party/blink/web_tests/platform/mac-mac11-arm64/webexposed/global-interface-listing-platform-specific-expected.txt

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/webexposed/global-interface-listing-platform-specific-expected.txt b/third_party/blink/web_tests/platform/mac-mac11-arm64/webexposed/global-interface-listing-platform-specific-expected.txt
new file mode 100644
index 0000000..c4d6a2e2
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/webexposed/global-interface-listing-platform-specific-expected.txt
@@ -0,0 +1,102 @@
+This test documents all interface attributes and methods on the global window object and element instances.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+[INTERFACES]
+interface BarcodeDetector
+    static method getSupportedFormats
+    attribute @@toStringTag
+    method constructor
+    method detect
+interface Bluetooth : EventTarget
+    attribute @@toStringTag
+    getter onadvertisementreceived
+    method constructor
+    method getAvailability
+    method getDevices
+    method requestDevice
+    method requestLEScan
+    setter onadvertisementreceived
+interface BluetoothCharacteristicProperties
+    attribute @@toStringTag
+    getter authenticatedSignedWrites
+    getter broadcast
+    getter indicate
+    getter notify
+    getter read
+    getter reliableWrite
+    getter writableAuxiliaries
+    getter write
+    getter writeWithoutResponse
+    method constructor
+interface BluetoothDevice : EventTarget
+    attribute @@toStringTag
+    getter gatt
+    getter id
+    getter name
+    getter onadvertisementreceived
+    getter ongattserverdisconnected
+    getter watchingAdvertisements
+    method constructor
+    method watchAdvertisements
+    setter onadvertisementreceived
+    setter ongattserverdisconnected
+interface BluetoothRemoteGATTCharacteristic : EventTarget
+    attribute @@toStringTag
+    getter oncharacteristicvaluechanged
+    getter properties
+    getter service
+    getter uuid
+    getter value
+    method constructor
+    method getDescriptor
+    method getDescriptors
+    method readValue
+    method startNotifications
+    method stopNotifications
+    method writeValue
+    method writeValueWithResponse
+    method writeValueWithoutResponse
+    setter oncharacteristicvaluechanged
+interface BluetoothRemoteGATTDescriptor
+    attribute @@toStringTag
+    getter characteristic
+    getter uuid
+    getter value
+    method constructor
+    method readValue
+    method writeValue
+interface BluetoothRemoteGATTServer
+    attribute @@toStringTag
+    getter connected
+    getter device
+    method connect
+    method constructor
+    method disconnect
+    method getPrimaryService
+    method getPrimaryServices
+interface BluetoothRemoteGATTService
+    attribute @@toStringTag
+    getter device
+    getter isPrimary
+    getter uuid
+    method constructor
+    method getCharacteristic
+    method getCharacteristics
+interface BluetoothUUID
+    static method canonicalUUID
+    static method getCharacteristic
+    static method getDescriptor
+    static method getService
+    attribute @@toStringTag
+    method constructor
+interface Navigator
+    getter bluetooth
+interface Notification : EventTarget
+    getter image
+[NAMESPACES]
+[GLOBAL OBJECT]
+PASS successfullyParsed is true
+
+TEST COMPLETE
+

third_party/blink/web_tests/platform/mac-mac11-arm64/wpt_internal/battery-status/multiple-promises-after-resolve-expected.txt

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/wpt_internal/battery-status/multiple-promises-after-resolve-expected.txt b/third_party/blink/web_tests/platform/mac-mac11-arm64/wpt_internal/battery-status/multiple-promises-after-resolve-expected.txt
new file mode 100644
index 0000000..1d3c6139
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/wpt_internal/battery-status/multiple-promises-after-resolve-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+PASS multiple consecutive invocations of navigator.getBattery()
+Harness: the test ran to completion.
+

third_party/blink/web_tests/platform/mac/compositing/3d-corners-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/compositing/3d-corners-expected.png b/third_party/blink/web_tests/platform/mac/compositing/3d-corners-expected.png
deleted file mode 100644
index 401c2a35..0000000
--- a/third_party/blink/web_tests/platform/mac/compositing/3d-corners-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/compositing/3d-cube-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/compositing/3d-cube-expected.png b/third_party/blink/web_tests/platform/mac/compositing/3d-cube-expected.png
deleted file mode 100644
index 0379629e..0000000
--- a/third_party/blink/web_tests/platform/mac/compositing/3d-cube-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/compositing/direct-image-compositing-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/compositing/direct-image-compositing-expected.png b/third_party/blink/web_tests/platform/mac/compositing/direct-image-compositing-expected.png
index 1833717..407830063 100644
--- a/third_party/blink/web_tests/platform/mac/compositing/direct-image-compositing-expected.png
+++ b/third_party/blink/web_tests/platform/mac/compositing/direct-image-compositing-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/compositing/geometry/layer-due-to-layer-children-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/compositing/geometry/layer-due-to-layer-children-expected.png b/third_party/blink/web_tests/platform/mac/compositing/geometry/layer-due-to-layer-children-expected.png
index f189cdd..2b2240c 100644
--- a/third_party/blink/web_tests/platform/mac/compositing/geometry/layer-due-to-layer-children-expected.png
+++ b/third_party/blink/web_tests/platform/mac/compositing/geometry/layer-due-to-layer-children-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/compositing/geometry/vertical-scroll-composited-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/compositing/geometry/vertical-scroll-composited-expected.png b/third_party/blink/web_tests/platform/mac/compositing/geometry/vertical-scroll-composited-expected.png
deleted file mode 100644
index 8437dc2..0000000
--- a/third_party/blink/web_tests/platform/mac/compositing/geometry/vertical-scroll-composited-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/compositing/geometry/video-fixed-scrolling-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/compositing/geometry/video-fixed-scrolling-expected.png b/third_party/blink/web_tests/platform/mac/compositing/geometry/video-fixed-scrolling-expected.png
index 06b5458..9ea676f 100644
--- a/third_party/blink/web_tests/platform/mac/compositing/geometry/video-fixed-scrolling-expected.png
+++ b/third_party/blink/web_tests/platform/mac/compositing/geometry/video-fixed-scrolling-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/compositing/geometry/video-opacity-overlay-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/compositing/geometry/video-opacity-overlay-expected.png b/third_party/blink/web_tests/platform/mac/compositing/geometry/video-opacity-overlay-expected.png
index 2c5ced9..de9fbdf 100644
--- a/third_party/blink/web_tests/platform/mac/compositing/geometry/video-opacity-overlay-expected.png
+++ b/third_party/blink/web_tests/platform/mac/compositing/geometry/video-opacity-overlay-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/compositing/gestures/gesture-tapHighlight-pixel-rotated-div-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/compositing/gestures/gesture-tapHighlight-pixel-rotated-div-expected.png b/third_party/blink/web_tests/platform/mac/compositing/gestures/gesture-tapHighlight-pixel-rotated-div-expected.png
index bdef9117..f29b0cd 100644
--- a/third_party/blink/web_tests/platform/mac/compositing/gestures/gesture-tapHighlight-pixel-rotated-div-expected.png
+++ b/third_party/blink/web_tests/platform/mac/compositing/gestures/gesture-tapHighlight-pixel-rotated-div-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/compositing/layers-inside-overflow-scroll-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/compositing/layers-inside-overflow-scroll-expected.png b/third_party/blink/web_tests/platform/mac/compositing/layers-inside-overflow-scroll-expected.png
index 74918d8..c479e70b 100644
--- a/third_party/blink/web_tests/platform/mac/compositing/layers-inside-overflow-scroll-expected.png
+++ b/third_party/blink/web_tests/platform/mac/compositing/layers-inside-overflow-scroll-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/compositing/lots-of-img-layers-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/compositing/lots-of-img-layers-expected.png b/third_party/blink/web_tests/platform/mac/compositing/lots-of-img-layers-expected.png
deleted file mode 100644
index cdc5d7e..0000000
--- a/third_party/blink/web_tests/platform/mac/compositing/lots-of-img-layers-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/compositing/lots-of-img-layers-with-opacity-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/compositing/lots-of-img-layers-with-opacity-expected.png b/third_party/blink/web_tests/platform/mac/compositing/lots-of-img-layers-with-opacity-expected.png
deleted file mode 100644
index 62b02fa8..0000000
--- a/third_party/blink/web_tests/platform/mac/compositing/lots-of-img-layers-with-opacity-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/compositing/masks/direct-image-mask-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/compositing/masks/direct-image-mask-expected.png b/third_party/blink/web_tests/platform/mac/compositing/masks/direct-image-mask-expected.png
index 61fc6164..7843e25 100644
--- a/third_party/blink/web_tests/platform/mac/compositing/masks/direct-image-mask-expected.png
+++ b/third_party/blink/web_tests/platform/mac/compositing/masks/direct-image-mask-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/compositing/masks/mask-with-added-filters-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/compositing/masks/mask-with-added-filters-expected.png b/third_party/blink/web_tests/platform/mac/compositing/masks/mask-with-added-filters-expected.png
index 1c91b8a..9adb670714 100644
--- a/third_party/blink/web_tests/platform/mac/compositing/masks/mask-with-added-filters-expected.png
+++ b/third_party/blink/web_tests/platform/mac/compositing/masks/mask-with-added-filters-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/compositing/overflow/mask-with-filter-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/compositing/overflow/mask-with-filter-expected.png b/third_party/blink/web_tests/platform/mac/compositing/overflow/mask-with-filter-expected.png
deleted file mode 100644
index a91cb534..0000000
--- a/third_party/blink/web_tests/platform/mac/compositing/overflow/mask-with-filter-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/compositing/overflow/nested-render-surfaces-with-rotation-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/compositing/overflow/nested-render-surfaces-with-rotation-expected.png b/third_party/blink/web_tests/platform/mac/compositing/overflow/nested-render-surfaces-with-rotation-expected.png
index aaffc474..55588426 100644
--- a/third_party/blink/web_tests/platform/mac/compositing/overflow/nested-render-surfaces-with-rotation-expected.png
+++ b/third_party/blink/web_tests/platform/mac/compositing/overflow/nested-render-surfaces-with-rotation-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/compositing/overflow/rotate-then-clip-z-order-interleave-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/compositing/overflow/rotate-then-clip-z-order-interleave-expected.png b/third_party/blink/web_tests/platform/mac/compositing/overflow/rotate-then-clip-z-order-interleave-expected.png
deleted file mode 100644
index 07d2a97..0000000
--- a/third_party/blink/web_tests/platform/mac/compositing/overflow/rotate-then-clip-z-order-interleave-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/compositing/overflow/tiled-mask-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/compositing/overflow/tiled-mask-expected.png b/third_party/blink/web_tests/platform/mac/compositing/overflow/tiled-mask-expected.png
index e2b5a6d..39c7856c 100644
--- a/third_party/blink/web_tests/platform/mac/compositing/overflow/tiled-mask-expected.png
+++ b/third_party/blink/web_tests/platform/mac/compositing/overflow/tiled-mask-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/compositing/perpendicular-layer-sorting-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/compositing/perpendicular-layer-sorting-expected.png b/third_party/blink/web_tests/platform/mac/compositing/perpendicular-layer-sorting-expected.png
deleted file mode 100644
index 1e7fc25..0000000
--- a/third_party/blink/web_tests/platform/mac/compositing/perpendicular-layer-sorting-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/compositing/perspective-interest-rect-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/compositing/perspective-interest-rect-expected.png b/third_party/blink/web_tests/platform/mac/compositing/perspective-interest-rect-expected.png
index 8f65ca2d..6317014 100644
--- a/third_party/blink/web_tests/platform/mac/compositing/perspective-interest-rect-expected.png
+++ b/third_party/blink/web_tests/platform/mac/compositing/perspective-interest-rect-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/compositing/reflections/nested-reflection-anchor-point-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/compositing/reflections/nested-reflection-anchor-point-expected.png b/third_party/blink/web_tests/platform/mac/compositing/reflections/nested-reflection-anchor-point-expected.png
index 0259f95..1b4b676 100644
--- a/third_party/blink/web_tests/platform/mac/compositing/reflections/nested-reflection-anchor-point-expected.png
+++ b/third_party/blink/web_tests/platform/mac/compositing/reflections/nested-reflection-anchor-point-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/compositing/reflections/nested-reflection-animated-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/compositing/reflections/nested-reflection-animated-expected.png b/third_party/blink/web_tests/platform/mac/compositing/reflections/nested-reflection-animated-expected.png
index bd4ed00..b2a84da5 100644
--- a/third_party/blink/web_tests/platform/mac/compositing/reflections/nested-reflection-animated-expected.png
+++ b/third_party/blink/web_tests/platform/mac/compositing/reflections/nested-reflection-animated-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/compositing/self-painting-layers-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/compositing/self-painting-layers-expected.png b/third_party/blink/web_tests/platform/mac/compositing/self-painting-layers-expected.png
index 5629ccb..7a36a4e3 100644
--- a/third_party/blink/web_tests/platform/mac/compositing/self-painting-layers-expected.png
+++ b/third_party/blink/web_tests/platform/mac/compositing/self-painting-layers-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/compositing/video/video-controls-squashing-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/compositing/video/video-controls-squashing-expected.png b/third_party/blink/web_tests/platform/mac/compositing/video/video-controls-squashing-expected.png
index 0b38a72..d149eb9 100644
--- a/third_party/blink/web_tests/platform/mac/compositing/video/video-controls-squashing-expected.png
+++ b/third_party/blink/web_tests/platform/mac/compositing/video/video-controls-squashing-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/compositing/visibility/visibility-image-layers-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/compositing/visibility/visibility-image-layers-expected.png b/third_party/blink/web_tests/platform/mac/compositing/visibility/visibility-image-layers-expected.png
index dacc12e..80e763c 100644
--- a/third_party/blink/web_tests/platform/mac/compositing/visibility/visibility-image-layers-expected.png
+++ b/third_party/blink/web_tests/platform/mac/compositing/visibility/visibility-image-layers-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/compositing/visibility/visibility-simple-video-layer-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/compositing/visibility/visibility-simple-video-layer-expected.png b/third_party/blink/web_tests/platform/mac/compositing/visibility/visibility-simple-video-layer-expected.png
index 7d2a82d4..64458de 100644
--- a/third_party/blink/web_tests/platform/mac/compositing/visibility/visibility-simple-video-layer-expected.png
+++ b/third_party/blink/web_tests/platform/mac/compositing/visibility/visibility-simple-video-layer-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/compositing/webgl/webgl-reflection-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/compositing/webgl/webgl-reflection-expected.png b/third_party/blink/web_tests/platform/mac/compositing/webgl/webgl-reflection-expected.png
index 4676d10..f9ed44fa9 100644
--- a/third_party/blink/web_tests/platform/mac/compositing/webgl/webgl-reflection-expected.png
+++ b/third_party/blink/web_tests/platform/mac/compositing/webgl/webgl-reflection-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/css3/blending/background-blend-mode-overlapping-accelerated-elements-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/css3/blending/background-blend-mode-overlapping-accelerated-elements-expected.png b/third_party/blink/web_tests/platform/mac/css3/blending/background-blend-mode-overlapping-accelerated-elements-expected.png
index 818b59f4..edaacf3 100644
--- a/third_party/blink/web_tests/platform/mac/css3/blending/background-blend-mode-overlapping-accelerated-elements-expected.png
+++ b/third_party/blink/web_tests/platform/mac/css3/blending/background-blend-mode-overlapping-accelerated-elements-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/css3/filters/effect-brightness-clamping-hw-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/css3/filters/effect-brightness-clamping-hw-expected.png b/third_party/blink/web_tests/platform/mac/css3/filters/effect-brightness-clamping-hw-expected.png
index 32fa074..4beb0f9 100644
--- a/third_party/blink/web_tests/platform/mac/css3/filters/effect-brightness-clamping-hw-expected.png
+++ b/third_party/blink/web_tests/platform/mac/css3/filters/effect-brightness-clamping-hw-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/css3/filters/effect-combined-hw-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/css3/filters/effect-combined-hw-expected.png b/third_party/blink/web_tests/platform/mac/css3/filters/effect-combined-hw-expected.png
index 88501d2..67c5f21 100644
--- a/third_party/blink/web_tests/platform/mac/css3/filters/effect-combined-hw-expected.png
+++ b/third_party/blink/web_tests/platform/mac/css3/filters/effect-combined-hw-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/css3/filters/effect-contrast-hw-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/css3/filters/effect-contrast-hw-expected.png b/third_party/blink/web_tests/platform/mac/css3/filters/effect-contrast-hw-expected.png
index 19c6cfb..3e8577f 100644
--- a/third_party/blink/web_tests/platform/mac/css3/filters/effect-contrast-hw-expected.png
+++ b/third_party/blink/web_tests/platform/mac/css3/filters/effect-contrast-hw-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/css3/filters/effect-reference-colorspace-hw-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/css3/filters/effect-reference-colorspace-hw-expected.png b/third_party/blink/web_tests/platform/mac/css3/filters/effect-reference-colorspace-hw-expected.png
index 930afce1..981c76d 100644
--- a/third_party/blink/web_tests/platform/mac/css3/filters/effect-reference-colorspace-hw-expected.png
+++ b/third_party/blink/web_tests/platform/mac/css3/filters/effect-reference-colorspace-hw-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/css3/filters/effect-reference-hw-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/css3/filters/effect-reference-hw-expected.png b/third_party/blink/web_tests/platform/mac/css3/filters/effect-reference-hw-expected.png
index 3d85213..4fcda53f 100644
--- a/third_party/blink/web_tests/platform/mac/css3/filters/effect-reference-hw-expected.png
+++ b/third_party/blink/web_tests/platform/mac/css3/filters/effect-reference-hw-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/css3/filters/effect-reference-subregion-hw-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/css3/filters/effect-reference-subregion-hw-expected.png b/third_party/blink/web_tests/platform/mac/css3/filters/effect-reference-subregion-hw-expected.png
index 654e9015..4375f07 100644
--- a/third_party/blink/web_tests/platform/mac/css3/filters/effect-reference-subregion-hw-expected.png
+++ b/third_party/blink/web_tests/platform/mac/css3/filters/effect-reference-subregion-hw-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/css3/filters/effect-reference-zoom-hw-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/css3/filters/effect-reference-zoom-hw-expected.png b/third_party/blink/web_tests/platform/mac/css3/filters/effect-reference-zoom-hw-expected.png
deleted file mode 100644
index 1eb88105a..0000000
--- a/third_party/blink/web_tests/platform/mac/css3/filters/effect-reference-zoom-hw-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/css3/filters/filter-repaint-composited-fallback-crash-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/css3/filters/filter-repaint-composited-fallback-crash-expected.png b/third_party/blink/web_tests/platform/mac/css3/filters/filter-repaint-composited-fallback-crash-expected.png
deleted file mode 100644
index d4b2992..0000000
--- a/third_party/blink/web_tests/platform/mac/css3/filters/filter-repaint-composited-fallback-crash-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/css3/filters/filter-repaint-composited-fallback-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/css3/filters/filter-repaint-composited-fallback-expected.png b/third_party/blink/web_tests/platform/mac/css3/filters/filter-repaint-composited-fallback-expected.png
deleted file mode 100644
index d4b2992..0000000
--- a/third_party/blink/web_tests/platform/mac/css3/filters/filter-repaint-composited-fallback-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/external/wpt/content-security-policy/child-src/child-src-cross-origin-load.sub-expected.txt

diff --git a/third_party/blink/web_tests/platform/mac/external/wpt/content-security-policy/child-src/child-src-cross-origin-load.sub-expected.txt b/third_party/blink/web_tests/platform/mac/external/wpt/content-security-policy/child-src/child-src-cross-origin-load.sub-expected.txt
new file mode 100644
index 0000000..a369027d
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac/external/wpt/content-security-policy/child-src/child-src-cross-origin-load.sub-expected.txt
@@ -0,0 +1,5 @@
+This is a testharness.js-based test.
+PASS Expecting logs: ["PASS IFrame #1 generated a load event.","PASS IFrame #2 generated a load event.","PASS IFrame #3 generated a load event.", "violated-directive=frame-src"]
+PASS Expecting alerts: ["PASS","PASS"]
+Harness: the test ran to completion.
+

third_party/blink/web_tests/platform/mac/fast/borders/border-radius-with-composited-child-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/fast/borders/border-radius-with-composited-child-expected.png b/third_party/blink/web_tests/platform/mac/fast/borders/border-radius-with-composited-child-expected.png
index 2127e12..c79bd74 100644
--- a/third_party/blink/web_tests/platform/mac/fast/borders/border-radius-with-composited-child-expected.png
+++ b/third_party/blink/web_tests/platform/mac/fast/borders/border-radius-with-composited-child-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/fast/forms/color-scheme/media/video-overlay-menu-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/fast/forms/color-scheme/media/video-overlay-menu-expected.png b/third_party/blink/web_tests/platform/mac/fast/forms/color-scheme/media/video-overlay-menu-expected.png
index 7a28f67f..7d9e5a3 100644
--- a/third_party/blink/web_tests/platform/mac/fast/forms/color-scheme/media/video-overlay-menu-expected.png
+++ b/third_party/blink/web_tests/platform/mac/fast/forms/color-scheme/media/video-overlay-menu-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/fast/forms/color-scheme/media/video-overlay-play-button-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/fast/forms/color-scheme/media/video-overlay-play-button-expected.png b/third_party/blink/web_tests/platform/mac/fast/forms/color-scheme/media/video-overlay-play-button-expected.png
index 3052bcd..d6a11e0 100644
--- a/third_party/blink/web_tests/platform/mac/fast/forms/color-scheme/media/video-overlay-play-button-expected.png
+++ b/third_party/blink/web_tests/platform/mac/fast/forms/color-scheme/media/video-overlay-play-button-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/fast/frames/frame-set-scaling-rotate-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/fast/frames/frame-set-scaling-rotate-expected.png b/third_party/blink/web_tests/platform/mac/fast/frames/frame-set-scaling-rotate-expected.png
deleted file mode 100644
index 26748d4..0000000
--- a/third_party/blink/web_tests/platform/mac/fast/frames/frame-set-scaling-rotate-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/fast/frames/frame-set-scaling-skew-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/fast/frames/frame-set-scaling-skew-expected.png b/third_party/blink/web_tests/platform/mac/fast/frames/frame-set-scaling-skew-expected.png
deleted file mode 100644
index 98b34c4..0000000
--- a/third_party/blink/web_tests/platform/mac/fast/frames/frame-set-scaling-skew-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/fast/sub-pixel/transformed-iframe-copy-on-scroll-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/fast/sub-pixel/transformed-iframe-copy-on-scroll-expected.png b/third_party/blink/web_tests/platform/mac/fast/sub-pixel/transformed-iframe-copy-on-scroll-expected.png
index 4e95e37..7115a58 100644
--- a/third_party/blink/web_tests/platform/mac/fast/sub-pixel/transformed-iframe-copy-on-scroll-expected.png
+++ b/third_party/blink/web_tests/platform/mac/fast/sub-pixel/transformed-iframe-copy-on-scroll-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/fast/webgl/pixelated-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/fast/webgl/pixelated-expected.png b/third_party/blink/web_tests/platform/mac/fast/webgl/pixelated-expected.png
new file mode 100644
index 0000000..67235f2
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac/fast/webgl/pixelated-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/fast/webgl/webgl-composite-modes-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/fast/webgl/webgl-composite-modes-expected.png b/third_party/blink/web_tests/platform/mac/fast/webgl/webgl-composite-modes-expected.png
new file mode 100644
index 0000000..8d879af
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac/fast/webgl/webgl-composite-modes-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/fast/webgl/webgl-composite-modes-repaint-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/fast/webgl/webgl-composite-modes-repaint-expected.png b/third_party/blink/web_tests/platform/mac/fast/webgl/webgl-composite-modes-repaint-expected.png
index cebec49..8e5c542 100644
--- a/third_party/blink/web_tests/platform/mac/fast/webgl/webgl-composite-modes-repaint-expected.png
+++ b/third_party/blink/web_tests/platform/mac/fast/webgl/webgl-composite-modes-repaint-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/fast/webgl/webgl-composite-modes-tabswitching-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/fast/webgl/webgl-composite-modes-tabswitching-expected.png b/third_party/blink/web_tests/platform/mac/fast/webgl/webgl-composite-modes-tabswitching-expected.png
index 7bab576..0efbeec 100644
--- a/third_party/blink/web_tests/platform/mac/fast/webgl/webgl-composite-modes-tabswitching-expected.png
+++ b/third_party/blink/web_tests/platform/mac/fast/webgl/webgl-composite-modes-tabswitching-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/images/color-profile-image-canvas-pattern-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/images/color-profile-image-canvas-pattern-expected.png b/third_party/blink/web_tests/platform/mac/images/color-profile-image-canvas-pattern-expected.png
deleted file mode 100644
index 6df2f8f..0000000
--- a/third_party/blink/web_tests/platform/mac/images/color-profile-image-canvas-pattern-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/images/yuv-decode-eligible/color-profile-layer-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/images/yuv-decode-eligible/color-profile-layer-expected.png b/third_party/blink/web_tests/platform/mac/images/yuv-decode-eligible/color-profile-layer-expected.png
index 0ae5563..38c34f4 100644
--- a/third_party/blink/web_tests/platform/mac/images/yuv-decode-eligible/color-profile-layer-expected.png
+++ b/third_party/blink/web_tests/platform/mac/images/yuv-decode-eligible/color-profile-layer-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/images/yuv-decode-eligible/color-profile-layer-filter-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/images/yuv-decode-eligible/color-profile-layer-filter-expected.png b/third_party/blink/web_tests/platform/mac/images/yuv-decode-eligible/color-profile-layer-filter-expected.png
deleted file mode 100644
index 61461e8f..0000000
--- a/third_party/blink/web_tests/platform/mac/images/yuv-decode-eligible/color-profile-layer-filter-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/inspector-protocol/emulation/set-vision-deficiency-expected.txt

diff --git a/third_party/blink/web_tests/platform/mac/inspector-protocol/emulation/set-vision-deficiency-expected.txt b/third_party/blink/web_tests/platform/mac/inspector-protocol/emulation/set-vision-deficiency-expected.txt
new file mode 100644
index 0000000..5a4b1e4c
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac/inspector-protocol/emulation/set-vision-deficiency-expected.txt
@@ -0,0 +1,54 @@
+Tests that vision deficiencies can be emulated.
+<p>Emulating "none":
+<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAFRJREFUWIXt18ENACAMw8DA5N0chnCQePgGiKz+ujI5aZru3K6uPWAgZSBlIGUgZSBlIGUgZSBlILWS030iyr6/oIGUgZSBlIGUgZSBlIGUgZSB1AXNwwVLtuf+dAAAAABJRU5ErkJggg==">
+<p>Emulating "achromatopsia":
+<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAFdJREFUWIXt18ENACAMw0BArNuVuwoM4SDx8A0QWf11VtUZQd2dnBsruvaAgZSBlIGUgZSBlIGUgZSBlIHUTv8Qad9f0EDKQMpAykDKQMpAykDKQMpA6gKkyAfMkeetfgAAAABJRU5ErkJggg==">
+<p>Emulating "blurredVision":
+<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAj5JREFUWIXtlstu2zAQRQ8flqz41QRG4q/oT/e7ujSQVZDAtiwxFNnF0HFStLFaKoAXusAAAiwNji+lmav4/iOy3ML0CYoalAcdgcjnmkEsgRX4e+geoNnAfg27FRwreLaAhoO60Ovvsiy3cPsT5o9Q7ME4UFHqU80hTiFuwB/BKYEyMwg3EEqoIjT/zZYAqydYPMJiC9MX0A5U4LKDC4hLuc9PwN2CqcG30HRQB1BIZQFOapjsoXyB6bMA6j6AHcQIcQ6vNdBA4cB2YANM8sDOgNqDdXK02oFpewIWEFup4MF6MAFMTK7FbPcEUAXeSqdSocc7GCAGcVEnGDUM1EfAN8VzqT5fcfxD8dt1vvRgnb5II2CuRsBcjYC5ejcHF0AHFECfTVKlew1f+T8t3AFriD7t1lY2RK9VN4U4gXiCVAySED4AxhWETYKrzqAXAU2CW8hzoYBgIJzcHAbS0t1Dd4SuhG4vi79XYNXJuQr8HXQz6XGC9EMB+gdoFbS3QAPGp1fqEqCCqCAW4GfQrsHNwU3BWYZzsNlIEtY1vKYsqHsu+6AAA76E1zkcvkmv1oLXcMyHtOzXEtN9K2HT9In7Jyk5zmDEuWMFhxtoCtgb+X2XB2nZrYAbiek2nMNmX0AQyM5CbQWutuJeJlwCrMCVUCY4+49Z7vQxeA1OgzPpaE9jJ0+KmY9U75JwTs9jmoG74WahgiCWLTI77d61HFAqTeWr1dWHhREwVyNgrkbAXI2AuRoBczUC5urqAX8BQkfph8RN0rgAAAAASUVORK5CYII=">
+<p>Emulating "none":
+<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAFRJREFUWIXt18ENACAMw8DA5N0chnCQePgGiKz+ujI5aZru3K6uPWAgZSBlIGUgZSBlIGUgZSBlILWS030iyr6/oIGUgZSBlIGUgZSBlIGUgZSB1AXNwwVLtuf+dAAAAABJRU5ErkJggg==">
+<p>Emulating "deuteranopia":
+<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAGNJREFUWIXt10ENgDAQBdFtReAGQzVQDdWHBlRwABHzSXqYJ+BnsrdtcxxvBa3rTs5Vj679wEDKQMpAykDKQMpAykDKQMpAqtX5RH+StO0vaCBlIGUgZSBlIGUgZSBlIGUg9QEgIQa9hKQMdAAAAABJRU5ErkJggg==">
+<p>Emulating "none":
+<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAFRJREFUWIXt18ENACAMw8DA5N0chnCQePgGiKz+ujI5aZru3K6uPWAgZSBlIGUgZSBlIGUgZSBlILWS030iyr6/oIGUgZSBlIGUgZSBlIGUgZSB1AXNwwVLtuf+dAAAAABJRU5ErkJggg==">
+<p>Emulating "protanopia":
+<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAFxJREFUWIXt17ENACEMBEFDldRB/hG90gYUsYf0wU4Bp5UztzXrVNC3o3PVo2sPGEgZSBlIGUgZSBlIGUgZSBlItRon+0SE/f6CBlIGUgZSBlIGUgZSBlIGUgZSF6dNBvu7bH4DAAAAAElFTkSuQmCC">
+<p>Emulating "tritanopia":
+<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAFlJREFUWIXt10ENACAQxEAgqEEbEhCNAxDRJeHREbBp7ne1rHlK0h7RuRZde8BAykDKQMpAykDKQMpAykDKQKqnf4i07y9oIGUgZSBlIGUgZSBlIGUgZSB1AS8fBG2mWYWcAAAAAElFTkSuQmCC">
+<p>Emulating "tritanopia":
+<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAEVJREFUWIXtzjEBwCAQALEH/55bCQw3wJAoyJqZbx62bwdOBCvBSrASrAQrwUqwEqwEK8FKsBKsBCvBSrASrAQrwUqw+gET9wFPp/w1TAAAAABJRU5ErkJggg==">
+<p>Emulating "some-invalid-deficiency":
+{
+  "code": -32602,
+  "message": "Unknown vision deficiency type"
+}
+<p>Emulating "":
+{
+  "code": -32602,
+  "message": "Unknown vision deficiency type"
+}
+<p>Emulating "achromatomaly":
+{
+  "code": -32602,
+  "message": "Unknown vision deficiency type"
+}
+<p>Emulating "deuteranomaly":
+{
+  "code": -32602,
+  "message": "Unknown vision deficiency type"
+}
+<p>Emulating "protanomaly":
+{
+  "code": -32602,
+  "message": "Unknown vision deficiency type"
+}
+<p>Emulating "tritanomaly":
+{
+  "code": -32602,
+  "message": "Unknown vision deficiency type"
+}
+<p>Navigating&mldr;
+<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAFlJREFUWIXt10ENACAQxEAgqEEbEhCNAxDRJeHREbBp7ne1rHlK0h7RuRZde8BAykDKQMpAykDKQMpAykDKQKqnf4i07y9oIGUgZSBlIGUgZSBlIGUgZSB1AS8fBG2mWYWcAAAAAElFTkSuQmCC">
+<p>Emulating "achromatopsia":
+<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAFdJREFUWIXt18ENACAMw0BArNuVuwoM4SDx8A0QWf11VtUZQd2dnBsruvaAgZSBlIGUgZSBlIGUgZSBlIHUTv8Qad9f0EDKQMpAykDKQMpAykDKQMpA6gKkyAfMkeetfgAAAABJRU5ErkJggg==">
+

third_party/blink/web_tests/platform/mac/media/color-profile-video-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/media/color-profile-video-expected.png b/third_party/blink/web_tests/platform/mac/media/color-profile-video-expected.png
deleted file mode 100644
index 94a9be87..0000000
--- a/third_party/blink/web_tests/platform/mac/media/color-profile-video-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/media/color-profile-video-seek-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/media/color-profile-video-seek-expected.png b/third_party/blink/web_tests/platform/mac/media/color-profile-video-seek-expected.png
deleted file mode 100644
index bbbfc6d..0000000
--- a/third_party/blink/web_tests/platform/mac/media/color-profile-video-seek-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/media/color-profile-video-seek-filter-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/media/color-profile-video-seek-filter-expected.png b/third_party/blink/web_tests/platform/mac/media/color-profile-video-seek-filter-expected.png
index 9ebfd14..c1490d7 100644
--- a/third_party/blink/web_tests/platform/mac/media/color-profile-video-seek-filter-expected.png
+++ b/third_party/blink/web_tests/platform/mac/media/color-profile-video-seek-filter-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/media/color-profile-video-seek-object-fit-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/media/color-profile-video-seek-object-fit-expected.png b/third_party/blink/web_tests/platform/mac/media/color-profile-video-seek-object-fit-expected.png
deleted file mode 100644
index f0d3fca..0000000
--- a/third_party/blink/web_tests/platform/mac/media/color-profile-video-seek-object-fit-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/media/controls-after-reload-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/media/controls-after-reload-expected.png b/third_party/blink/web_tests/platform/mac/media/controls-after-reload-expected.png
index 88fed9a9..32da18b0 100644
--- a/third_party/blink/web_tests/platform/mac/media/controls-after-reload-expected.png
+++ b/third_party/blink/web_tests/platform/mac/media/controls-after-reload-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/media/controls-strict-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/media/controls-strict-expected.png b/third_party/blink/web_tests/platform/mac/media/controls-strict-expected.png
index fc4d3c9..9bb35b0e 100644
--- a/third_party/blink/web_tests/platform/mac/media/controls-strict-expected.png
+++ b/third_party/blink/web_tests/platform/mac/media/controls-strict-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/media/controls-styling-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/media/controls-styling-expected.png b/third_party/blink/web_tests/platform/mac/media/controls-styling-expected.png
index 9cca21c..1ce9d80 100644
--- a/third_party/blink/web_tests/platform/mac/media/controls-styling-expected.png
+++ b/third_party/blink/web_tests/platform/mac/media/controls-styling-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/media/controls-styling-strict-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/media/controls-styling-strict-expected.png b/third_party/blink/web_tests/platform/mac/media/controls-styling-strict-expected.png
index aaf3dbf2..e2bc37aa 100644
--- a/third_party/blink/web_tests/platform/mac/media/controls-styling-strict-expected.png
+++ b/third_party/blink/web_tests/platform/mac/media/controls-styling-strict-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/media/controls-without-preload-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/media/controls-without-preload-expected.png b/third_party/blink/web_tests/platform/mac/media/controls-without-preload-expected.png
index 171b2f8..569fe0da 100644
--- a/third_party/blink/web_tests/platform/mac/media/controls-without-preload-expected.png
+++ b/third_party/blink/web_tests/platform/mac/media/controls-without-preload-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/media/controls/paint-controls-webkit-appearance-none-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/media/controls/paint-controls-webkit-appearance-none-expected.png b/third_party/blink/web_tests/platform/mac/media/controls/paint-controls-webkit-appearance-none-expected.png
index a80acb23..ede3eb09 100644
--- a/third_party/blink/web_tests/platform/mac/media/controls/paint-controls-webkit-appearance-none-expected.png
+++ b/third_party/blink/web_tests/platform/mac/media/controls/paint-controls-webkit-appearance-none-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/media/controls/video-overlay-cast-dark-rendering-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/media/controls/video-overlay-cast-dark-rendering-expected.png b/third_party/blink/web_tests/platform/mac/media/controls/video-overlay-cast-dark-rendering-expected.png
index 7b94e3c..8f601a9 100644
--- a/third_party/blink/web_tests/platform/mac/media/controls/video-overlay-cast-dark-rendering-expected.png
+++ b/third_party/blink/web_tests/platform/mac/media/controls/video-overlay-cast-dark-rendering-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/media/controls/video-overlay-cast-light-rendering-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/media/controls/video-overlay-cast-light-rendering-expected.png b/third_party/blink/web_tests/platform/mac/media/controls/video-overlay-cast-light-rendering-expected.png
index b63d41c..956fb59 100644
--- a/third_party/blink/web_tests/platform/mac/media/controls/video-overlay-cast-light-rendering-expected.png
+++ b/third_party/blink/web_tests/platform/mac/media/controls/video-overlay-cast-light-rendering-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/media/track/track-cue-rendering-horizontal-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/media/track/track-cue-rendering-horizontal-expected.png b/third_party/blink/web_tests/platform/mac/media/track/track-cue-rendering-horizontal-expected.png
index c0199be..1a2fd65e 100644
--- a/third_party/blink/web_tests/platform/mac/media/track/track-cue-rendering-horizontal-expected.png
+++ b/third_party/blink/web_tests/platform/mac/media/track/track-cue-rendering-horizontal-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/media/track/track-cue-rendering-vertical-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/media/track/track-cue-rendering-vertical-expected.png b/third_party/blink/web_tests/platform/mac/media/track/track-cue-rendering-vertical-expected.png
index 3b61e305..68ca2ad 100644
--- a/third_party/blink/web_tests/platform/mac/media/track/track-cue-rendering-vertical-expected.png
+++ b/third_party/blink/web_tests/platform/mac/media/track/track-cue-rendering-vertical-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/media/video-aspect-ratio-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/media/video-aspect-ratio-expected.png b/third_party/blink/web_tests/platform/mac/media/video-aspect-ratio-expected.png
index 9e64707d..7ba337f 100644
--- a/third_party/blink/web_tests/platform/mac/media/video-aspect-ratio-expected.png
+++ b/third_party/blink/web_tests/platform/mac/media/video-aspect-ratio-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/media/video-canvas-alpha-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/media/video-canvas-alpha-expected.png b/third_party/blink/web_tests/platform/mac/media/video-canvas-alpha-expected.png
index fd6a9eba..73833681 100644
--- a/third_party/blink/web_tests/platform/mac/media/video-canvas-alpha-expected.png
+++ b/third_party/blink/web_tests/platform/mac/media/video-canvas-alpha-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/media/video-colorspace-yuv422-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/media/video-colorspace-yuv422-expected.png b/third_party/blink/web_tests/platform/mac/media/video-colorspace-yuv422-expected.png
index 6bbd2a1..76823b0 100644
--- a/third_party/blink/web_tests/platform/mac/media/video-colorspace-yuv422-expected.png
+++ b/third_party/blink/web_tests/platform/mac/media/video-colorspace-yuv422-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/media/video-controls-rendering-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/media/video-controls-rendering-expected.png b/third_party/blink/web_tests/platform/mac/media/video-controls-rendering-expected.png
index 07f01276..0125c87 100644
--- a/third_party/blink/web_tests/platform/mac/media/video-controls-rendering-expected.png
+++ b/third_party/blink/web_tests/platform/mac/media/video-controls-rendering-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/media/video-display-toggle-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/media/video-display-toggle-expected.png b/third_party/blink/web_tests/platform/mac/media/video-display-toggle-expected.png
index bffbb6e..c5244ca 100644
--- a/third_party/blink/web_tests/platform/mac/media/video-display-toggle-expected.png
+++ b/third_party/blink/web_tests/platform/mac/media/video-display-toggle-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/media/video-no-audio-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/media/video-no-audio-expected.png b/third_party/blink/web_tests/platform/mac/media/video-no-audio-expected.png
index e7ff72a..8e81886 100644
--- a/third_party/blink/web_tests/platform/mac/media/video-no-audio-expected.png
+++ b/third_party/blink/web_tests/platform/mac/media/video-no-audio-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/media/video-remove-insert-repaints-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/media/video-remove-insert-repaints-expected.png b/third_party/blink/web_tests/platform/mac/media/video-remove-insert-repaints-expected.png
index 4bbeaaf..fdcd378 100644
--- a/third_party/blink/web_tests/platform/mac/media/video-remove-insert-repaints-expected.png
+++ b/third_party/blink/web_tests/platform/mac/media/video-remove-insert-repaints-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/media/video-replaces-poster-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/media/video-replaces-poster-expected.png b/third_party/blink/web_tests/platform/mac/media/video-replaces-poster-expected.png
index 3405eb4..56822a9a 100644
--- a/third_party/blink/web_tests/platform/mac/media/video-replaces-poster-expected.png
+++ b/third_party/blink/web_tests/platform/mac/media/video-replaces-poster-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/media/video-zoom-controls-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/media/video-zoom-controls-expected.png b/third_party/blink/web_tests/platform/mac/media/video-zoom-controls-expected.png
index d41fbdd..d7062eb 100644
--- a/third_party/blink/web_tests/platform/mac/media/video-zoom-controls-expected.png
+++ b/third_party/blink/web_tests/platform/mac/media/video-zoom-controls-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/media/video-zoom-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/media/video-zoom-expected.png b/third_party/blink/web_tests/platform/mac/media/video-zoom-expected.png
index 8ad3c9a..7960fc1 100644
--- a/third_party/blink/web_tests/platform/mac/media/video-zoom-expected.png
+++ b/third_party/blink/web_tests/platform/mac/media/video-zoom-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/plugins/refcount-leaks-expected.txt

diff --git a/third_party/blink/web_tests/platform/mac/plugins/refcount-leaks-expected.txt b/third_party/blink/web_tests/platform/mac/plugins/refcount-leaks-expected.txt
new file mode 100644
index 0000000..2372e38
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac/plugins/refcount-leaks-expected.txt
@@ -0,0 +1,10 @@
+Test that we can get an NPObject returned through a method on an NPAPI Object.
+
+Prints "SUCCESS" on success, "FAILURE" on failure. 
+
+--- num test objects:
+countAfterCreate == countOrig + 3? PASS
+countOrig == countAfterGC? PASS
+countOrig == countAfterGC2? FAIL
+
+FAILURE

third_party/blink/web_tests/platform/mac/transforms/3d/general/perspective-units-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/transforms/3d/general/perspective-units-expected.png b/third_party/blink/web_tests/platform/mac/transforms/3d/general/perspective-units-expected.png
index f15211b..f62b17a 100644
--- a/third_party/blink/web_tests/platform/mac/transforms/3d/general/perspective-units-expected.png
+++ b/third_party/blink/web_tests/platform/mac/transforms/3d/general/perspective-units-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/transforms/3d/point-mapping/3d-point-mapping-deep-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/transforms/3d/point-mapping/3d-point-mapping-deep-expected.png b/third_party/blink/web_tests/platform/mac/transforms/3d/point-mapping/3d-point-mapping-deep-expected.png
index 7b700caa..d2257aa 100644
--- a/third_party/blink/web_tests/platform/mac/transforms/3d/point-mapping/3d-point-mapping-deep-expected.png
+++ b/third_party/blink/web_tests/platform/mac/transforms/3d/point-mapping/3d-point-mapping-deep-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/transforms/3d/point-mapping/3d-point-mapping-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/transforms/3d/point-mapping/3d-point-mapping-expected.png b/third_party/blink/web_tests/platform/mac/transforms/3d/point-mapping/3d-point-mapping-expected.png
index 604999e..348f148 100644
--- a/third_party/blink/web_tests/platform/mac/transforms/3d/point-mapping/3d-point-mapping-expected.png
+++ b/third_party/blink/web_tests/platform/mac/transforms/3d/point-mapping/3d-point-mapping-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/transforms/3d/point-mapping/3d-point-mapping-origins-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/transforms/3d/point-mapping/3d-point-mapping-origins-expected.png b/third_party/blink/web_tests/platform/mac/transforms/3d/point-mapping/3d-point-mapping-origins-expected.png
index 9c77b0f..1ca302fa1 100644
--- a/third_party/blink/web_tests/platform/mac/transforms/3d/point-mapping/3d-point-mapping-origins-expected.png
+++ b/third_party/blink/web_tests/platform/mac/transforms/3d/point-mapping/3d-point-mapping-origins-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/transforms/3d/point-mapping/3d-point-mapping-preserve-3d-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/transforms/3d/point-mapping/3d-point-mapping-preserve-3d-expected.png b/third_party/blink/web_tests/platform/mac/transforms/3d/point-mapping/3d-point-mapping-preserve-3d-expected.png
index 43681bc..f41ba32 100644
--- a/third_party/blink/web_tests/platform/mac/transforms/3d/point-mapping/3d-point-mapping-preserve-3d-expected.png
+++ b/third_party/blink/web_tests/platform/mac/transforms/3d/point-mapping/3d-point-mapping-preserve-3d-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/backface-visibility-interop/transforms/3d/point-mapping/3d-point-mapping-origins-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/backface-visibility-interop/transforms/3d/point-mapping/3d-point-mapping-origins-expected.png b/third_party/blink/web_tests/platform/mac/virtual/backface-visibility-interop/transforms/3d/point-mapping/3d-point-mapping-origins-expected.png
new file mode 100644
index 0000000..1ca302fa1
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac/virtual/backface-visibility-interop/transforms/3d/point-mapping/3d-point-mapping-origins-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/controls-refresh-hc/fast/forms/color-scheme/media/video-overlay-menu-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh-hc/fast/forms/color-scheme/media/video-overlay-menu-expected.png b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh-hc/fast/forms/color-scheme/media/video-overlay-menu-expected.png
index 8477d83..e343e2f7 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh-hc/fast/forms/color-scheme/media/video-overlay-menu-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh-hc/fast/forms/color-scheme/media/video-overlay-menu-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/controls-refresh-hc/fast/forms/color-scheme/media/video-overlay-play-button-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh-hc/fast/forms/color-scheme/media/video-overlay-play-button-expected.png b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh-hc/fast/forms/color-scheme/media/video-overlay-play-button-expected.png
index c8a32c95..38cae7d 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh-hc/fast/forms/color-scheme/media/video-overlay-play-button-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh-hc/fast/forms/color-scheme/media/video-overlay-play-button-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/dark-color-scheme/fast/forms/color-scheme/media/video-overlay-menu-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/dark-color-scheme/fast/forms/color-scheme/media/video-overlay-menu-expected.png b/third_party/blink/web_tests/platform/mac/virtual/dark-color-scheme/fast/forms/color-scheme/media/video-overlay-menu-expected.png
index 0f2f03a..46dfd917 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/dark-color-scheme/fast/forms/color-scheme/media/video-overlay-menu-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/dark-color-scheme/fast/forms/color-scheme/media/video-overlay-menu-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/dark-color-scheme/fast/forms/color-scheme/media/video-overlay-play-button-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/dark-color-scheme/fast/forms/color-scheme/media/video-overlay-play-button-expected.png b/third_party/blink/web_tests/platform/mac/virtual/dark-color-scheme/fast/forms/color-scheme/media/video-overlay-play-button-expected.png
index 0306a2e2..d234ee7 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/dark-color-scheme/fast/forms/color-scheme/media/video-overlay-play-button-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/dark-color-scheme/fast/forms/color-scheme/media/video-overlay-play-button-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/dark-color-scheme/media/video-controls-rendering-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/dark-color-scheme/media/video-controls-rendering-expected.png b/third_party/blink/web_tests/platform/mac/virtual/dark-color-scheme/media/video-controls-rendering-expected.png
index 11620df..23c9c52 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/dark-color-scheme/media/video-controls-rendering-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/dark-color-scheme/media/video-controls-rendering-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/delayed-animation-updates/external/wpt/css/css-transitions/transition-base-response-002-expected.txt

diff --git a/third_party/blink/web_tests/platform/mac/virtual/delayed-animation-updates/external/wpt/css/css-transitions/transition-base-response-002-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/delayed-animation-updates/external/wpt/css/css-transitions/transition-base-response-002-expected.txt
new file mode 100644
index 0000000..51d58ef
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac/virtual/delayed-animation-updates/external/wpt/css/css-transitions/transition-base-response-002-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+PASS Transitioning font-size on root affects rem units
+Harness: the test ran to completion.
+

third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/2-comp-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/2-comp-expected.png b/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/2-comp-expected.png
deleted file mode 100644
index cc54e35..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/2-comp-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-jpeg-with-color-profile-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-jpeg-with-color-profile-expected.png b/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-jpeg-with-color-profile-expected.png
deleted file mode 100644
index 889a3b3ab..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-jpeg-with-color-profile-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-animate-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-animate-expected.png b/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-animate-expected.png
deleted file mode 100644
index e78b941..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-animate-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-animate-rotate-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-animate-rotate-expected.png b/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-animate-rotate-expected.png
deleted file mode 100644
index 0e05755..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-animate-rotate-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-background-image-cover-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-background-image-cover-expected.png b/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-background-image-cover-expected.png
deleted file mode 100644
index ad98a77..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-background-image-cover-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-background-image-repeat-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-background-image-repeat-expected.png b/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-background-image-repeat-expected.png
deleted file mode 100644
index a7fdfef..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-background-image-repeat-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-background-image-space-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-background-image-space-expected.png b/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-background-image-space-expected.png
deleted file mode 100644
index ebcd335..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-background-image-space-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-border-image-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-border-image-expected.png b/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-border-image-expected.png
deleted file mode 100644
index df9a5bd..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-border-image-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-group-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-group-expected.png b/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-group-expected.png
index b96f453..b67b8f9 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-group-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-group-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-image-canvas-pattern-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-image-canvas-pattern-expected.png b/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-image-canvas-pattern-expected.png
deleted file mode 100644
index 6577884..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-image-canvas-pattern-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-image-canvas-svg-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-image-canvas-svg-expected.png b/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-image-canvas-svg-expected.png
index fe719a2a..93ddabe 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-image-canvas-svg-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-image-canvas-svg-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-image-filter-all-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-image-filter-all-expected.png b/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-image-filter-all-expected.png
index 294e3510..73b3431 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-image-filter-all-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-image-filter-all-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-image-object-fit-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-image-object-fit-expected.png b/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-image-object-fit-expected.png
deleted file mode 100644
index e8f62fa..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-image-object-fit-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-image-shape-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-image-shape-expected.png b/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-image-shape-expected.png
index 7b06d341..2902a7f 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-image-shape-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-image-shape-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-image-svg-resource-url-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-image-svg-resource-url-expected.png b/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-image-svg-resource-url-expected.png
deleted file mode 100644
index 80fc4fc..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-image-svg-resource-url-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-mask-image-svg-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-mask-image-svg-expected.png b/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-mask-image-svg-expected.png
deleted file mode 100644
index cc7f30b0..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-mask-image-svg-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-object-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-object-expected.png b/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-object-expected.png
deleted file mode 100644
index e1be2312..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-object-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-svg-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-svg-expected.png b/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-svg-expected.png
deleted file mode 100644
index b1782b3..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-svg-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-svg-foreign-object-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-svg-foreign-object-expected.png b/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-svg-foreign-object-expected.png
index 25fedcd1..16a87e2 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-svg-foreign-object-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/color-profile-svg-foreign-object-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/jpeg-with-color-profile-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/jpeg-with-color-profile-expected.png b/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/jpeg-with-color-profile-expected.png
index 8cb1c249..dc447c1 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/jpeg-with-color-profile-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/jpeg-with-color-profile-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/jpeg-yuv-progressive-canvas-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/jpeg-yuv-progressive-canvas-expected.png b/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/jpeg-yuv-progressive-canvas-expected.png
deleted file mode 100644
index e680ad7..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/jpeg-yuv-progressive-canvas-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/jpeg-yuv-progressive-image-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/jpeg-yuv-progressive-image-expected.png b/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/jpeg-yuv-progressive-image-expected.png
deleted file mode 100644
index cb9d2d3..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/jpeg-yuv-progressive-image-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/motion-jpeg-single-frame-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/motion-jpeg-single-frame-expected.png b/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/motion-jpeg-single-frame-expected.png
deleted file mode 100644
index eb4df96..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/motion-jpeg-single-frame-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/png-with-color-profile-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/png-with-color-profile-expected.png b/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/png-with-color-profile-expected.png
index d1fc04a..5cead00 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/png-with-color-profile-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/png-with-color-profile-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/webp-color-profile-lossless-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/webp-color-profile-lossless-expected.png b/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/webp-color-profile-lossless-expected.png
deleted file mode 100644
index 9063e780..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/webp-color-profile-lossless-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/webp-color-profile-lossy-alpha-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/webp-color-profile-lossy-alpha-expected.png b/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/webp-color-profile-lossy-alpha-expected.png
deleted file mode 100644
index 398b2fa..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/webp-color-profile-lossy-alpha-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-border-radius-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-border-radius-expected.png b/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-border-radius-expected.png
index 0ddc33b2..e90a8d0 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-border-radius-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-border-radius-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-filter-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-filter-expected.png b/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-filter-expected.png
index 1d4226b..ae5aeca5 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-filter-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-filter-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-image-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-image-expected.png b/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-image-expected.png
index ac1d035..f631d64 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-image-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-image-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png b/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png
deleted file mode 100644
index bf53ed4..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-layer-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-layer-expected.png b/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-layer-expected.png
index 3393ddf..ca93aa5 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-layer-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-layer-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-layer-filter-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-layer-filter-expected.png b/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-layer-filter-expected.png
deleted file mode 100644
index a37ed05e..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-layer-filter-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/yuv-decode-eligible/jpeg-missing-eoi-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/yuv-decode-eligible/jpeg-missing-eoi-expected.png b/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/yuv-decode-eligible/jpeg-missing-eoi-expected.png
deleted file mode 100644
index eaf5baf..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/yuv-decode-eligible/jpeg-missing-eoi-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/yuv-decode-eligible/webp-color-profile-lossy-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/yuv-decode-eligible/webp-color-profile-lossy-expected.png b/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/yuv-decode-eligible/webp-color-profile-lossy-expected.png
deleted file mode 100644
index db8f1a0..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/yuv-decode-eligible/webp-color-profile-lossy-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/yuv-decode-eligible/webp-no-color-profile-lossy-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/yuv-decode-eligible/webp-no-color-profile-lossy-expected.png b/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/yuv-decode-eligible/webp-no-color-profile-lossy-expected.png
deleted file mode 100644
index 193a648..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/exotic-color-space/images/yuv-decode-eligible/webp-no-color-profile-lossy-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-filter-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-filter-expected.png b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-filter-expected.png
index df5139c..c36d8483 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-filter-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-filter-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/2-comp-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/2-comp-expected.png b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/2-comp-expected.png
index 63e409c..5147ada 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/2-comp-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/2-comp-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/color-profile-background-image-cross-fade-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/color-profile-background-image-cross-fade-expected.png b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/color-profile-background-image-cross-fade-expected.png
index cc0f0b5d..62f5ec7 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/color-profile-background-image-cross-fade-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/color-profile-background-image-cross-fade-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/color-profile-background-image-cross-fade-png-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/color-profile-background-image-cross-fade-png-expected.png b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/color-profile-background-image-cross-fade-png-expected.png
index cc0f0b5d..62f5ec7 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/color-profile-background-image-cross-fade-png-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/color-profile-background-image-cross-fade-png-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/color-profile-image-canvas-pattern-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/color-profile-image-canvas-pattern-expected.png b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/color-profile-image-canvas-pattern-expected.png
deleted file mode 100644
index 3415ad6..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/color-profile-image-canvas-pattern-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/color-profile-image-filter-all-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/color-profile-image-filter-all-expected.png b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/color-profile-image-filter-all-expected.png
index fbdd0e7a..fad88ba 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/color-profile-image-filter-all-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/color-profile-image-filter-all-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/color-profile-mask-image-svg-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/color-profile-mask-image-svg-expected.png b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/color-profile-mask-image-svg-expected.png
deleted file mode 100644
index c9069e3..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/color-profile-mask-image-svg-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/color-profile-svg-foreign-object-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/color-profile-svg-foreign-object-expected.png b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/color-profile-svg-foreign-object-expected.png
index 5aef6cb..66bc8e9 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/color-profile-svg-foreign-object-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/color-profile-svg-foreign-object-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/cross-fade-background-size-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/cross-fade-background-size-expected.png b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/cross-fade-background-size-expected.png
index 3d280839..b5f95fe 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/cross-fade-background-size-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/cross-fade-background-size-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/imagemap-focus-ring-with-scale-transform-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/imagemap-focus-ring-with-scale-transform-expected.png b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/imagemap-focus-ring-with-scale-transform-expected.png
index 70e5b4c9..19defd2 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/imagemap-focus-ring-with-scale-transform-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/imagemap-focus-ring-with-scale-transform-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/imagemap-overflowing-polygon-focus-ring-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/imagemap-overflowing-polygon-focus-ring-expected.png b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/imagemap-overflowing-polygon-focus-ring-expected.png
index 570ce3d7..886b8fc 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/imagemap-overflowing-polygon-focus-ring-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/imagemap-overflowing-polygon-focus-ring-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/imagemap-polygon-focus-ring-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/imagemap-polygon-focus-ring-expected.png b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/imagemap-polygon-focus-ring-expected.png
index 6fa2a8e..b57d2579 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/imagemap-polygon-focus-ring-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/imagemap-polygon-focus-ring-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-filter-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-filter-expected.png b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-filter-expected.png
index 65722860..3c1a112 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-filter-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-filter-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-image-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-image-expected.png b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-image-expected.png
index c266fbe..e037a1f 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-image-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-image-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/canvas-composite-shadow-part1-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/canvas-composite-shadow-part1-expected.png b/third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/canvas-composite-shadow-part1-expected.png
index a9838dc1..06739483 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/canvas-composite-shadow-part1-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/canvas-composite-shadow-part1-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/canvas-composite-shadow-part2-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/canvas-composite-shadow-part2-expected.png b/third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/canvas-composite-shadow-part2-expected.png
index d3faf26..24a2aec 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/canvas-composite-shadow-part2-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/canvas-composite-shadow-part2-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/canvas-composite-video-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/canvas-composite-video-expected.png b/third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/canvas-composite-video-expected.png
index 452d917..6cc7d0a 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/canvas-composite-video-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/canvas-composite-video-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/canvas-composite-video-shadow-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/canvas-composite-video-shadow-expected.png b/third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/canvas-composite-video-shadow-expected.png
index b9f9948..a9f1463 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/canvas-composite-video-shadow-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/canvas-composite-video-shadow-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/canvas-drawImage-video-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/canvas-drawImage-video-expected.png b/third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/canvas-drawImage-video-expected.png
new file mode 100644
index 0000000..8260acb8
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/canvas-drawImage-video-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/canvas-drawImage-video-reset-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/canvas-drawImage-video-reset-expected.png b/third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/canvas-drawImage-video-reset-expected.png
new file mode 100644
index 0000000..f17d9f6
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/canvas-drawImage-video-reset-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/canvas-toDataURL-jpeg-maximum-quality-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/canvas-toDataURL-jpeg-maximum-quality-expected.png b/third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/canvas-toDataURL-jpeg-maximum-quality-expected.png
index 590e379..e80d697c 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/canvas-toDataURL-jpeg-maximum-quality-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/canvas-toDataURL-jpeg-maximum-quality-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/canvas-toDataURL-webp-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/canvas-toDataURL-webp-expected.png b/third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/canvas-toDataURL-webp-expected.png
deleted file mode 100644
index 1f24f0be..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/canvas-toDataURL-webp-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/image-object-in-canvas-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/image-object-in-canvas-expected.png b/third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/image-object-in-canvas-expected.png
index 9f680a3..a9b1dae 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/image-object-in-canvas-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/image-object-in-canvas-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/quadraticCurveTo-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/quadraticCurveTo-expected.png b/third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/quadraticCurveTo-expected.png
index e6c26c6..6f4c626 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/quadraticCurveTo-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/gpu/fast/canvas/quadraticCurveTo-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/no-auto-wpt-origin-isolation/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-port.sub.https-expected.txt

diff --git a/third_party/blink/web_tests/platform/mac/virtual/no-auto-wpt-origin-isolation/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-port.sub.https-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/no-auto-wpt-origin-isolation/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-port.sub.https-expected.txt
new file mode 100644
index 0000000..28a773d8
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac/virtual/no-auto-wpt-origin-isolation/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-port.sub.https-expected.txt
@@ -0,0 +1,9 @@
+This is a testharness.js-based test.
+PASS messageerror event must occur
+FAIL setting document.domain must not give sync access assert_throws_dom: function "() => {
+        frameWindow.document;
+      }" did not throw
+FAIL parent: originAgentCluster must equal true assert_equals: expected true but got false
+PASS child: originAgentCluster must equal false
+Harness: the test ran to completion.
+

third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-arc-circumference-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-arc-circumference-expected.png b/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-arc-circumference-expected.png
deleted file mode 100644
index dbf2396..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-arc-circumference-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-arc-circumference-fill-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-arc-circumference-fill-expected.png b/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-arc-circumference-fill-expected.png
deleted file mode 100644
index f617ebb7..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-arc-circumference-fill-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-composite-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-composite-expected.png b/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-composite-expected.png
index 2b701f0..59b3fa8 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-composite-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-composite-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-composite-shadow-part1-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-composite-shadow-part1-expected.png b/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-composite-shadow-part1-expected.png
index a9838dc1..06739483 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-composite-shadow-part1-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-composite-shadow-part1-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-composite-shadow-part2-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-composite-shadow-part2-expected.png b/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-composite-shadow-part2-expected.png
index d3faf26..24a2aec 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-composite-shadow-part2-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-composite-shadow-part2-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-composite-transformclip-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-composite-transformclip-expected.png b/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-composite-transformclip-expected.png
deleted file mode 100644
index 158a3c5..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-composite-transformclip-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-composite-video-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-composite-video-expected.png b/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-composite-video-expected.png
index d64f7d18..7a44ce95 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-composite-video-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-composite-video-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-composite-video-shadow-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-composite-video-shadow-expected.png b/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-composite-video-shadow-expected.png
index 800294b..828ada8 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-composite-video-shadow-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-composite-video-shadow-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-drawImage-video-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-drawImage-video-expected.png b/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-drawImage-video-expected.png
new file mode 100644
index 0000000..8260acb8
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-drawImage-video-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-drawImage-video-reset-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-drawImage-video-reset-expected.png b/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-drawImage-video-reset-expected.png
new file mode 100644
index 0000000..f17d9f6
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-drawImage-video-reset-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-ellipse-circumference-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-ellipse-circumference-expected.png b/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-ellipse-circumference-expected.png
deleted file mode 100644
index 07466c2..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-ellipse-circumference-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-ellipse-circumference-fill-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-ellipse-circumference-fill-expected.png b/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-ellipse-circumference-fill-expected.png
deleted file mode 100644
index 951754e..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-ellipse-circumference-fill-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-ellipse-connecting-line-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-ellipse-connecting-line-expected.png b/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-ellipse-connecting-line-expected.png
index 5166bb7..3693990 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-ellipse-connecting-line-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-ellipse-connecting-line-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-imageSmoothingEnabled-patterns-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-imageSmoothingEnabled-patterns-expected.png b/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-imageSmoothingEnabled-patterns-expected.png
index 265b08d6..5a990a08 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-imageSmoothingEnabled-patterns-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-imageSmoothingEnabled-patterns-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-pattern-no-repeat-with-transformations-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-pattern-no-repeat-with-transformations-expected.png b/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-pattern-no-repeat-with-transformations-expected.png
index 809e71b..0915c13 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-pattern-no-repeat-with-transformations-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-pattern-no-repeat-with-transformations-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-shadow-source-in-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-shadow-source-in-expected.png b/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-shadow-source-in-expected.png
index 0bf8a29..3252f5e1 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-shadow-source-in-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-shadow-source-in-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-toDataURL-jpeg-maximum-quality-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-toDataURL-jpeg-maximum-quality-expected.png b/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-toDataURL-jpeg-maximum-quality-expected.png
index 548b4b6..966f810 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-toDataURL-jpeg-maximum-quality-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-toDataURL-jpeg-maximum-quality-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-toDataURL-webp-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-toDataURL-webp-expected.png b/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-toDataURL-webp-expected.png
deleted file mode 100644
index 8f89a1f..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-toDataURL-webp-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-zero-length-lineCap-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-zero-length-lineCap-expected.png b/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-zero-length-lineCap-expected.png
index acccb15..0b30d9b5 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-zero-length-lineCap-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/canvas-zero-length-lineCap-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/image-object-in-canvas-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/image-object-in-canvas-expected.png b/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/image-object-in-canvas-expected.png
index bb57243..ccaa51b 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/image-object-in-canvas-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/image-object-in-canvas-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/quadraticCurveTo-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/quadraticCurveTo-expected.png b/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/quadraticCurveTo-expected.png
index 33b9999..a97034d 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/quadraticCurveTo-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/oopr-canvas2d/fast/canvas/quadraticCurveTo-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/backdrop-filter-basic-blur-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/backdrop-filter-basic-blur-expected.png b/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/backdrop-filter-basic-blur-expected.png
deleted file mode 100644
index e344dc0..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/backdrop-filter-basic-blur-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/backdrop-filter-browser-zoom-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/backdrop-filter-browser-zoom-expected.png b/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/backdrop-filter-browser-zoom-expected.png
deleted file mode 100644
index 43f570a..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/backdrop-filter-browser-zoom-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-all-on-background-hw-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-all-on-background-hw-expected.png b/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-all-on-background-hw-expected.png
deleted file mode 100644
index 2dccb00..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-all-on-background-hw-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-brightness-clamping-hw-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-brightness-clamping-hw-expected.png b/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-brightness-clamping-hw-expected.png
index 26e9b80..ece3488a 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-brightness-clamping-hw-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-brightness-clamping-hw-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-brightness-hw-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-brightness-hw-expected.png b/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-brightness-hw-expected.png
index ce7e6a7..9f84c0b 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-brightness-hw-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-brightness-hw-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-combined-hw-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-combined-hw-expected.png b/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-combined-hw-expected.png
index 7024ddc..ba30d06 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-combined-hw-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-combined-hw-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-contrast-hw-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-contrast-hw-expected.png b/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-contrast-hw-expected.png
index bb0f66525..b4723a7 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-contrast-hw-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-contrast-hw-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-grayscale-hw-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-grayscale-hw-expected.png b/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-grayscale-hw-expected.png
index 440bc23..88080db 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-grayscale-hw-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-grayscale-hw-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-hue-rotate-hw-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-hue-rotate-hw-expected.png b/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-hue-rotate-hw-expected.png
index f2a8f3e..8422ee9a 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-hue-rotate-hw-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-hue-rotate-hw-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-opacity-hw-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-opacity-hw-expected.png b/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-opacity-hw-expected.png
index 9b01b9e..39213978 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-opacity-hw-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-opacity-hw-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-reference-colorspace-hw-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-reference-colorspace-hw-expected.png b/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-reference-colorspace-hw-expected.png
index b19e9dc..8280186 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-reference-colorspace-hw-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-reference-colorspace-hw-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-reference-hw-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-reference-hw-expected.png b/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-reference-hw-expected.png
index 941c9e4..b13a1ab 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-reference-hw-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-reference-hw-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-reference-subregion-hw-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-reference-subregion-hw-expected.png b/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-reference-subregion-hw-expected.png
index 70abf2f..3e55a40 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-reference-subregion-hw-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-reference-subregion-hw-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-reference-zoom-hw-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-reference-zoom-hw-expected.png b/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-reference-zoom-hw-expected.png
index 5b428dd..feada61 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-reference-zoom-hw-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-reference-zoom-hw-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-saturate-hw-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-saturate-hw-expected.png b/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-saturate-hw-expected.png
index 7d5a881..03443038 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-saturate-hw-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-saturate-hw-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-sepia-hw-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-sepia-hw-expected.png b/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-sepia-hw-expected.png
index e673696..697c2a8 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-sepia-hw-expected.png
+++ b/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-sepia-hw-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/filter-repaint-composited-fallback-crash-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/filter-repaint-composited-fallback-crash-expected.png b/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/filter-repaint-composited-fallback-crash-expected.png
deleted file mode 100644
index 4cf7da53..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/filter-repaint-composited-fallback-crash-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/filter-repaint-composited-fallback-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/filter-repaint-composited-fallback-expected.png b/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/filter-repaint-composited-fallback-expected.png
deleted file mode 100644
index 4cf7da53..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/filter-repaint-composited-fallback-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac/webexposed/global-interface-listing-platform-specific-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/webexposed/global-interface-listing-platform-specific-expected.png b/third_party/blink/web_tests/platform/mac/webexposed/global-interface-listing-platform-specific-expected.png
new file mode 100644
index 0000000..d2257aa
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac/webexposed/global-interface-listing-platform-specific-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/webexposed/global-interface-listing-platform-specific-expected.txt

diff --git a/third_party/blink/web_tests/platform/mac/webexposed/global-interface-listing-platform-specific-expected.txt b/third_party/blink/web_tests/platform/mac/webexposed/global-interface-listing-platform-specific-expected.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac/webexposed/global-interface-listing-platform-specific-expected.txt

third_party/blink/web_tests/platform/mac/wpt_internal/battery-status/multiple-promises-after-resolve-expected.txt

diff --git a/third_party/blink/web_tests/platform/mac/wpt_internal/battery-status/multiple-promises-after-resolve-expected.txt b/third_party/blink/web_tests/platform/mac/wpt_internal/battery-status/multiple-promises-after-resolve-expected.txt
new file mode 100644
index 0000000..1d3c6139
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac/wpt_internal/battery-status/multiple-promises-after-resolve-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+PASS multiple consecutive invocations of navigator.getBattery()
+Harness: the test ran to completion.
+

third_party/blink/web_tests/platform/win/compositing/flat-with-transformed-child-expected.png

diff --git a/third_party/blink/web_tests/platform/win/compositing/flat-with-transformed-child-expected.png b/third_party/blink/web_tests/platform/win/compositing/flat-with-transformed-child-expected.png
deleted file mode 100644
index c319372..0000000
--- a/third_party/blink/web_tests/platform/win/compositing/flat-with-transformed-child-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/win/compositing/overflow/border-radius-styles-with-composited-child-expected.png

diff --git a/third_party/blink/web_tests/platform/win/compositing/overflow/border-radius-styles-with-composited-child-expected.png b/third_party/blink/web_tests/platform/win/compositing/overflow/border-radius-styles-with-composited-child-expected.png
deleted file mode 100644
index 842cefa4..0000000
--- a/third_party/blink/web_tests/platform/win/compositing/overflow/border-radius-styles-with-composited-child-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/win/css3/filters/effect-reference-hidpi-hw-expected.png

diff --git a/third_party/blink/web_tests/platform/win/css3/filters/effect-reference-hidpi-hw-expected.png b/third_party/blink/web_tests/platform/win/css3/filters/effect-reference-hidpi-hw-expected.png
deleted file mode 100644
index 35e0529..0000000
--- a/third_party/blink/web_tests/platform/win/css3/filters/effect-reference-hidpi-hw-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/win/css3/filters/effect-reference-ordering-hw-expected.png

diff --git a/third_party/blink/web_tests/platform/win/css3/filters/effect-reference-ordering-hw-expected.png b/third_party/blink/web_tests/platform/win/css3/filters/effect-reference-ordering-hw-expected.png
deleted file mode 100644
index 12db1a0..0000000
--- a/third_party/blink/web_tests/platform/win/css3/filters/effect-reference-ordering-hw-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/win/external/wpt/content-security-policy/child-src/child-src-cross-origin-load.sub-expected.txt

diff --git a/third_party/blink/web_tests/platform/win/external/wpt/content-security-policy/child-src/child-src-cross-origin-load.sub-expected.txt b/third_party/blink/web_tests/platform/win/external/wpt/content-security-policy/child-src/child-src-cross-origin-load.sub-expected.txt
new file mode 100644
index 0000000..a369027d
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win/external/wpt/content-security-policy/child-src/child-src-cross-origin-load.sub-expected.txt
@@ -0,0 +1,5 @@
+This is a testharness.js-based test.
+PASS Expecting logs: ["PASS IFrame #1 generated a load event.","PASS IFrame #2 generated a load event.","PASS IFrame #3 generated a load event.", "violated-directive=frame-src"]
+PASS Expecting alerts: ["PASS","PASS"]
+Harness: the test ran to completion.
+

third_party/blink/web_tests/platform/win/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png b/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png
deleted file mode 100644
index 827714e..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/win/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/jpeg-missing-eoi-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/jpeg-missing-eoi-expected.png b/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/jpeg-missing-eoi-expected.png
deleted file mode 100644
index a45ce53..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/jpeg-missing-eoi-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/color-jpeg-with-color-profile-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/color-jpeg-with-color-profile-expected.png b/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/color-jpeg-with-color-profile-expected.png
deleted file mode 100644
index 8bd187f..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/color-jpeg-with-color-profile-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/color-profile-background-image-cover-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/color-profile-background-image-cover-expected.png b/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/color-profile-background-image-cover-expected.png
deleted file mode 100644
index 4c15fc7..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/color-profile-background-image-cover-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/color-profile-background-image-repeat-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/color-profile-background-image-repeat-expected.png b/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/color-profile-background-image-repeat-expected.png
deleted file mode 100644
index 28884058..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/color-profile-background-image-repeat-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/color-profile-background-image-space-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/color-profile-background-image-space-expected.png b/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/color-profile-background-image-space-expected.png
deleted file mode 100644
index 707b2e2..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/color-profile-background-image-space-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/color-profile-border-image-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/color-profile-border-image-expected.png b/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/color-profile-border-image-expected.png
deleted file mode 100644
index f5cbeb24..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/color-profile-border-image-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/color-profile-image-canvas-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/color-profile-image-canvas-expected.png b/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/color-profile-image-canvas-expected.png
deleted file mode 100644
index 5aa485c..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/color-profile-image-canvas-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/rgb-png-with-cmyk-color-profile-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/rgb-png-with-cmyk-color-profile-expected.png b/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/rgb-png-with-cmyk-color-profile-expected.png
deleted file mode 100644
index 85e32a7c..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/rgb-png-with-cmyk-color-profile-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/ycbcr-with-cmyk-color-profile-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/ycbcr-with-cmyk-color-profile-expected.png b/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/ycbcr-with-cmyk-color-profile-expected.png
deleted file mode 100644
index 2500a7a..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/ycbcr-with-cmyk-color-profile-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png b/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png
deleted file mode 100644
index a58c85a..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/yuv-decode-eligible/jpeg-missing-eoi-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/yuv-decode-eligible/jpeg-missing-eoi-expected.png b/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/yuv-decode-eligible/jpeg-missing-eoi-expected.png
deleted file mode 100644
index 37fcecf..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/yuv-decode-eligible/jpeg-missing-eoi-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/win/virtual/gpu/fast/canvas/canvas-composite-transformclip-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/gpu/fast/canvas/canvas-composite-transformclip-expected.png b/third_party/blink/web_tests/platform/win/virtual/gpu/fast/canvas/canvas-composite-transformclip-expected.png
deleted file mode 100644
index 3fd6dde..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/gpu/fast/canvas/canvas-composite-transformclip-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/win/virtual/gpu/fast/canvas/canvas-pattern-no-repeat-with-transformations-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/gpu/fast/canvas/canvas-pattern-no-repeat-with-transformations-expected.png b/third_party/blink/web_tests/platform/win/virtual/gpu/fast/canvas/canvas-pattern-no-repeat-with-transformations-expected.png
deleted file mode 100644
index 2ac683c..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/gpu/fast/canvas/canvas-pattern-no-repeat-with-transformations-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/win/virtual/scalefactor200/css3/filters/backdrop-filter-transform-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/scalefactor200/css3/filters/backdrop-filter-transform-expected.png b/third_party/blink/web_tests/platform/win/virtual/scalefactor200/css3/filters/backdrop-filter-transform-expected.png
deleted file mode 100644
index bf75aa01..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/scalefactor200/css3/filters/backdrop-filter-transform-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/win/virtual/scalefactor200/css3/filters/effect-reference-hidpi-hw-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/scalefactor200/css3/filters/effect-reference-hidpi-hw-expected.png b/third_party/blink/web_tests/platform/win/virtual/scalefactor200/css3/filters/effect-reference-hidpi-hw-expected.png
deleted file mode 100644
index 35e0529..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/scalefactor200/css3/filters/effect-reference-hidpi-hw-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/win/virtual/scalefactor200/css3/filters/effect-reference-ordering-hw-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/scalefactor200/css3/filters/effect-reference-ordering-hw-expected.png b/third_party/blink/web_tests/platform/win/virtual/scalefactor200/css3/filters/effect-reference-ordering-hw-expected.png
deleted file mode 100644
index 4befff7..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/scalefactor200/css3/filters/effect-reference-ordering-hw-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/win/virtual/scalefactor200/css3/filters/filter-change-repaint-composited-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/scalefactor200/css3/filters/filter-change-repaint-composited-expected.png b/third_party/blink/web_tests/platform/win/virtual/scalefactor200/css3/filters/filter-change-repaint-composited-expected.png
deleted file mode 100644
index 57e724c7..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/scalefactor200/css3/filters/filter-change-repaint-composited-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/win/virtual/shared_array_buffer_on_desktop/fast/webgl/pixelated-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/shared_array_buffer_on_desktop/fast/webgl/pixelated-expected.png b/third_party/blink/web_tests/platform/win/virtual/shared_array_buffer_on_desktop/fast/webgl/pixelated-expected.png
deleted file mode 100644
index 705007f..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/shared_array_buffer_on_desktop/fast/webgl/pixelated-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/win/virtual/shared_array_buffer_on_desktop/fast/webgl/webgl-composite-modes-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/shared_array_buffer_on_desktop/fast/webgl/webgl-composite-modes-expected.png b/third_party/blink/web_tests/platform/win/virtual/shared_array_buffer_on_desktop/fast/webgl/webgl-composite-modes-expected.png
deleted file mode 100644
index 5dc0380..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/shared_array_buffer_on_desktop/fast/webgl/webgl-composite-modes-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/win7/external/wpt/content-security-policy/child-src/child-src-cross-origin-load.sub-expected.txt

diff --git a/third_party/blink/web_tests/platform/win7/external/wpt/content-security-policy/child-src/child-src-cross-origin-load.sub-expected.txt b/third_party/blink/web_tests/platform/win7/external/wpt/content-security-policy/child-src/child-src-cross-origin-load.sub-expected.txt
new file mode 100644
index 0000000..a369027d
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win7/external/wpt/content-security-policy/child-src/child-src-cross-origin-load.sub-expected.txt
@@ -0,0 +1,5 @@
+This is a testharness.js-based test.
+PASS Expecting logs: ["PASS IFrame #1 generated a load event.","PASS IFrame #2 generated a load event.","PASS IFrame #3 generated a load event.", "violated-directive=frame-src"]
+PASS Expecting alerts: ["PASS","PASS"]
+Harness: the test ran to completion.
+

third_party/blink/web_tests/platform/win7/fast/forms/suggestion-picker/week-suggestion-picker-appearance-expected.png

diff --git a/third_party/blink/web_tests/platform/win7/fast/forms/suggestion-picker/week-suggestion-picker-appearance-expected.png b/third_party/blink/web_tests/platform/win7/fast/forms/suggestion-picker/week-suggestion-picker-appearance-expected.png
new file mode 100644
index 0000000..41a74ca
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win7/fast/forms/suggestion-picker/week-suggestion-picker-appearance-expected.png
Binary files differ

third_party/blink/web_tests/virtual/exotic-color-space/images/2-comp-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/2-comp-expected.png b/third_party/blink/web_tests/virtual/exotic-color-space/images/2-comp-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/2-comp-expected.png
rename to third_party/blink/web_tests/virtual/exotic-color-space/images/2-comp-expected.png
Binary files differ

third_party/blink/web_tests/virtual/exotic-color-space/images/color-jpeg-with-color-profile-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/color-jpeg-with-color-profile-expected.png b/third_party/blink/web_tests/virtual/exotic-color-space/images/color-jpeg-with-color-profile-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/color-jpeg-with-color-profile-expected.png
rename to third_party/blink/web_tests/virtual/exotic-color-space/images/color-jpeg-with-color-profile-expected.png
Binary files differ

third_party/blink/web_tests/virtual/exotic-color-space/images/color-profile-animate-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/color-profile-animate-expected.png b/third_party/blink/web_tests/virtual/exotic-color-space/images/color-profile-animate-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/color-profile-animate-expected.png
rename to third_party/blink/web_tests/virtual/exotic-color-space/images/color-profile-animate-expected.png
Binary files differ

third_party/blink/web_tests/virtual/exotic-color-space/images/color-profile-animate-rotate-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/color-profile-animate-rotate-expected.png b/third_party/blink/web_tests/virtual/exotic-color-space/images/color-profile-animate-rotate-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/color-profile-animate-rotate-expected.png
rename to third_party/blink/web_tests/virtual/exotic-color-space/images/color-profile-animate-rotate-expected.png
Binary files differ

third_party/blink/web_tests/virtual/exotic-color-space/images/color-profile-background-image-cover-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/color-profile-background-image-cover-expected.png b/third_party/blink/web_tests/virtual/exotic-color-space/images/color-profile-background-image-cover-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/color-profile-background-image-cover-expected.png
rename to third_party/blink/web_tests/virtual/exotic-color-space/images/color-profile-background-image-cover-expected.png
Binary files differ

third_party/blink/web_tests/virtual/exotic-color-space/images/color-profile-background-image-repeat-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/color-profile-background-image-repeat-expected.png b/third_party/blink/web_tests/virtual/exotic-color-space/images/color-profile-background-image-repeat-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/color-profile-background-image-repeat-expected.png
rename to third_party/blink/web_tests/virtual/exotic-color-space/images/color-profile-background-image-repeat-expected.png
Binary files differ

third_party/blink/web_tests/virtual/exotic-color-space/images/color-profile-background-image-space-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/color-profile-background-image-space-expected.png b/third_party/blink/web_tests/virtual/exotic-color-space/images/color-profile-background-image-space-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/color-profile-background-image-space-expected.png
rename to third_party/blink/web_tests/virtual/exotic-color-space/images/color-profile-background-image-space-expected.png
Binary files differ

third_party/blink/web_tests/virtual/exotic-color-space/images/color-profile-border-image-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/color-profile-border-image-expected.png b/third_party/blink/web_tests/virtual/exotic-color-space/images/color-profile-border-image-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/color-profile-border-image-expected.png
rename to third_party/blink/web_tests/virtual/exotic-color-space/images/color-profile-border-image-expected.png
Binary files differ

third_party/blink/web_tests/virtual/exotic-color-space/images/color-profile-image-canvas-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/color-profile-image-canvas-expected.png b/third_party/blink/web_tests/virtual/exotic-color-space/images/color-profile-image-canvas-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/color-profile-image-canvas-expected.png
rename to third_party/blink/web_tests/virtual/exotic-color-space/images/color-profile-image-canvas-expected.png
Binary files differ

third_party/blink/web_tests/virtual/exotic-color-space/images/color-profile-image-canvas-pattern-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/color-profile-image-canvas-pattern-expected.png b/third_party/blink/web_tests/virtual/exotic-color-space/images/color-profile-image-canvas-pattern-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/color-profile-image-canvas-pattern-expected.png
rename to third_party/blink/web_tests/virtual/exotic-color-space/images/color-profile-image-canvas-pattern-expected.png
Binary files differ

third_party/blink/web_tests/virtual/exotic-color-space/images/color-profile-image-object-fit-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/color-profile-image-object-fit-expected.png b/third_party/blink/web_tests/virtual/exotic-color-space/images/color-profile-image-object-fit-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/color-profile-image-object-fit-expected.png
rename to third_party/blink/web_tests/virtual/exotic-color-space/images/color-profile-image-object-fit-expected.png
Binary files differ

third_party/blink/web_tests/virtual/exotic-color-space/images/color-profile-image-svg-resource-url-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/color-profile-image-svg-resource-url-expected.png b/third_party/blink/web_tests/virtual/exotic-color-space/images/color-profile-image-svg-resource-url-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/color-profile-image-svg-resource-url-expected.png
rename to third_party/blink/web_tests/virtual/exotic-color-space/images/color-profile-image-svg-resource-url-expected.png
Binary files differ

third_party/blink/web_tests/virtual/exotic-color-space/images/color-profile-mask-image-svg-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/color-profile-mask-image-svg-expected.png b/third_party/blink/web_tests/virtual/exotic-color-space/images/color-profile-mask-image-svg-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/color-profile-mask-image-svg-expected.png
rename to third_party/blink/web_tests/virtual/exotic-color-space/images/color-profile-mask-image-svg-expected.png
Binary files differ

third_party/blink/web_tests/virtual/exotic-color-space/images/color-profile-object-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/color-profile-object-expected.png b/third_party/blink/web_tests/virtual/exotic-color-space/images/color-profile-object-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/color-profile-object-expected.png
rename to third_party/blink/web_tests/virtual/exotic-color-space/images/color-profile-object-expected.png
Binary files differ

third_party/blink/web_tests/virtual/exotic-color-space/images/color-profile-svg-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/color-profile-svg-expected.png b/third_party/blink/web_tests/virtual/exotic-color-space/images/color-profile-svg-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/color-profile-svg-expected.png
rename to third_party/blink/web_tests/virtual/exotic-color-space/images/color-profile-svg-expected.png
Binary files differ

third_party/blink/web_tests/virtual/exotic-color-space/images/jpeg-yuv-progressive-canvas-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/jpeg-yuv-progressive-canvas-expected.png b/third_party/blink/web_tests/virtual/exotic-color-space/images/jpeg-yuv-progressive-canvas-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/jpeg-yuv-progressive-canvas-expected.png
rename to third_party/blink/web_tests/virtual/exotic-color-space/images/jpeg-yuv-progressive-canvas-expected.png
Binary files differ

third_party/blink/web_tests/virtual/exotic-color-space/images/jpeg-yuv-progressive-image-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/jpeg-yuv-progressive-image-expected.png b/third_party/blink/web_tests/virtual/exotic-color-space/images/jpeg-yuv-progressive-image-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/jpeg-yuv-progressive-image-expected.png
rename to third_party/blink/web_tests/virtual/exotic-color-space/images/jpeg-yuv-progressive-image-expected.png
Binary files differ

third_party/blink/web_tests/virtual/exotic-color-space/images/motion-jpeg-single-frame-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/motion-jpeg-single-frame-expected.png b/third_party/blink/web_tests/virtual/exotic-color-space/images/motion-jpeg-single-frame-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/motion-jpeg-single-frame-expected.png
rename to third_party/blink/web_tests/virtual/exotic-color-space/images/motion-jpeg-single-frame-expected.png
Binary files differ

third_party/blink/web_tests/virtual/exotic-color-space/images/webp-color-profile-lossless-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/webp-color-profile-lossless-expected.png b/third_party/blink/web_tests/virtual/exotic-color-space/images/webp-color-profile-lossless-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/webp-color-profile-lossless-expected.png
rename to third_party/blink/web_tests/virtual/exotic-color-space/images/webp-color-profile-lossless-expected.png
Binary files differ

third_party/blink/web_tests/virtual/exotic-color-space/images/webp-color-profile-lossy-alpha-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/webp-color-profile-lossy-alpha-expected.png b/third_party/blink/web_tests/virtual/exotic-color-space/images/webp-color-profile-lossy-alpha-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/webp-color-profile-lossy-alpha-expected.png
rename to third_party/blink/web_tests/virtual/exotic-color-space/images/webp-color-profile-lossy-alpha-expected.png
Binary files differ

third_party/blink/web_tests/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png b/third_party/blink/web_tests/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png
rename to third_party/blink/web_tests/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png
Binary files differ

third_party/blink/web_tests/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-layer-filter-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-layer-filter-expected.png b/third_party/blink/web_tests/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-layer-filter-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-layer-filter-expected.png
rename to third_party/blink/web_tests/virtual/exotic-color-space/images/yuv-decode-eligible/color-profile-layer-filter-expected.png
Binary files differ

third_party/blink/web_tests/virtual/exotic-color-space/images/yuv-decode-eligible/jpeg-missing-eoi-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/yuv-decode-eligible/jpeg-missing-eoi-expected.png b/third_party/blink/web_tests/virtual/exotic-color-space/images/yuv-decode-eligible/jpeg-missing-eoi-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/yuv-decode-eligible/jpeg-missing-eoi-expected.png
rename to third_party/blink/web_tests/virtual/exotic-color-space/images/yuv-decode-eligible/jpeg-missing-eoi-expected.png
Binary files differ

third_party/blink/web_tests/virtual/exotic-color-space/images/yuv-decode-eligible/webp-color-profile-lossy-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/yuv-decode-eligible/webp-color-profile-lossy-expected.png b/third_party/blink/web_tests/virtual/exotic-color-space/images/yuv-decode-eligible/webp-color-profile-lossy-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/yuv-decode-eligible/webp-color-profile-lossy-expected.png
rename to third_party/blink/web_tests/virtual/exotic-color-space/images/yuv-decode-eligible/webp-color-profile-lossy-expected.png
Binary files differ

third_party/blink/web_tests/virtual/exotic-color-space/images/yuv-decode-eligible/webp-no-color-profile-lossy-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/yuv-decode-eligible/webp-no-color-profile-lossy-expected.png b/third_party/blink/web_tests/virtual/exotic-color-space/images/yuv-decode-eligible/webp-no-color-profile-lossy-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/virtual/exotic-color-space/images/yuv-decode-eligible/webp-no-color-profile-lossy-expected.png
rename to third_party/blink/web_tests/virtual/exotic-color-space/images/yuv-decode-eligible/webp-no-color-profile-lossy-expected.png
Binary files differ

third_party/blink/web_tests/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png

diff --git a/third_party/blink/web_tests/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png b/third_party/blink/web_tests/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png
index 18c5489..827714e 100644
--- a/third_party/blink/web_tests/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png
+++ b/third_party/blink/web_tests/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png
Binary files differ

third_party/blink/web_tests/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/jpeg-missing-eoi-expected.png

diff --git a/third_party/blink/web_tests/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/jpeg-missing-eoi-expected.png b/third_party/blink/web_tests/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/jpeg-missing-eoi-expected.png
index 1e30aba..a45ce53 100644
--- a/third_party/blink/web_tests/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/jpeg-missing-eoi-expected.png
+++ b/third_party/blink/web_tests/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/jpeg-missing-eoi-expected.png
Binary files differ

third_party/blink/web_tests/virtual/gpu-rasterization/images/color-jpeg-with-color-profile-expected.png

diff --git a/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-jpeg-with-color-profile-expected.png b/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-jpeg-with-color-profile-expected.png
index bdf97a3..8bd187f 100644
--- a/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-jpeg-with-color-profile-expected.png
+++ b/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-jpeg-with-color-profile-expected.png
Binary files differ

third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-background-image-cover-expected.png

diff --git a/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-background-image-cover-expected.png b/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-background-image-cover-expected.png
index da14a0e..4c15fc7 100644
--- a/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-background-image-cover-expected.png
+++ b/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-background-image-cover-expected.png
Binary files differ

third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-background-image-repeat-expected.png

diff --git a/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-background-image-repeat-expected.png b/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-background-image-repeat-expected.png
index 890d278e..28884058 100644
--- a/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-background-image-repeat-expected.png
+++ b/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-background-image-repeat-expected.png
Binary files differ

third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-background-image-space-expected.png

diff --git a/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-background-image-space-expected.png b/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-background-image-space-expected.png
index 7d74fd8..707b2e2 100644
--- a/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-background-image-space-expected.png
+++ b/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-background-image-space-expected.png
Binary files differ

third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-border-image-expected.png

diff --git a/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-border-image-expected.png b/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-border-image-expected.png
index 14cd13b..f5cbeb24 100644
--- a/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-border-image-expected.png
+++ b/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-border-image-expected.png
Binary files differ

third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-image-canvas-expected.png

diff --git a/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-image-canvas-expected.png b/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-image-canvas-expected.png
index 200168c..5aa485c 100644
--- a/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-image-canvas-expected.png
+++ b/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-image-canvas-expected.png
Binary files differ

third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-image-canvas-pattern-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/color-profile-image-canvas-pattern-expected.png b/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-image-canvas-pattern-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/color-profile-image-canvas-pattern-expected.png
rename to third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-image-canvas-pattern-expected.png
Binary files differ

third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-mask-image-svg-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/color-profile-mask-image-svg-expected.png b/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-mask-image-svg-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/color-profile-mask-image-svg-expected.png
rename to third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-mask-image-svg-expected.png
Binary files differ

third_party/blink/web_tests/virtual/gpu-rasterization/images/rgb-png-with-cmyk-color-profile-expected.png

diff --git a/third_party/blink/web_tests/virtual/gpu-rasterization/images/rgb-png-with-cmyk-color-profile-expected.png b/third_party/blink/web_tests/virtual/gpu-rasterization/images/rgb-png-with-cmyk-color-profile-expected.png
index dfe9984..85e32a7c 100644
--- a/third_party/blink/web_tests/virtual/gpu-rasterization/images/rgb-png-with-cmyk-color-profile-expected.png
+++ b/third_party/blink/web_tests/virtual/gpu-rasterization/images/rgb-png-with-cmyk-color-profile-expected.png
Binary files differ

third_party/blink/web_tests/virtual/gpu-rasterization/images/ycbcr-with-cmyk-color-profile-expected.png

diff --git a/third_party/blink/web_tests/virtual/gpu-rasterization/images/ycbcr-with-cmyk-color-profile-expected.png b/third_party/blink/web_tests/virtual/gpu-rasterization/images/ycbcr-with-cmyk-color-profile-expected.png
index 2128d87..2500a7a 100644
--- a/third_party/blink/web_tests/virtual/gpu-rasterization/images/ycbcr-with-cmyk-color-profile-expected.png
+++ b/third_party/blink/web_tests/virtual/gpu-rasterization/images/ycbcr-with-cmyk-color-profile-expected.png
Binary files differ

third_party/blink/web_tests/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png

diff --git a/third_party/blink/web_tests/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png b/third_party/blink/web_tests/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png
index 8ae7979..a58c85a 100644
--- a/third_party/blink/web_tests/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png
+++ b/third_party/blink/web_tests/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png
Binary files differ

third_party/blink/web_tests/virtual/gpu-rasterization/images/yuv-decode-eligible/jpeg-missing-eoi-expected.png

diff --git a/third_party/blink/web_tests/virtual/gpu-rasterization/images/yuv-decode-eligible/jpeg-missing-eoi-expected.png b/third_party/blink/web_tests/virtual/gpu-rasterization/images/yuv-decode-eligible/jpeg-missing-eoi-expected.png
index 0e80ef7c..37fcecf 100644
--- a/third_party/blink/web_tests/virtual/gpu-rasterization/images/yuv-decode-eligible/jpeg-missing-eoi-expected.png
+++ b/third_party/blink/web_tests/virtual/gpu-rasterization/images/yuv-decode-eligible/jpeg-missing-eoi-expected.png
Binary files differ

third_party/blink/web_tests/virtual/gpu/fast/canvas/canvas-composite-transformclip-expected.png

diff --git a/third_party/blink/web_tests/virtual/gpu/fast/canvas/canvas-composite-transformclip-expected.png b/third_party/blink/web_tests/virtual/gpu/fast/canvas/canvas-composite-transformclip-expected.png
index 1214384..3fd6dde 100644
--- a/third_party/blink/web_tests/virtual/gpu/fast/canvas/canvas-composite-transformclip-expected.png
+++ b/third_party/blink/web_tests/virtual/gpu/fast/canvas/canvas-composite-transformclip-expected.png
Binary files differ

third_party/blink/web_tests/virtual/gpu/fast/canvas/canvas-pattern-no-repeat-with-transformations-expected.png

diff --git a/third_party/blink/web_tests/virtual/gpu/fast/canvas/canvas-pattern-no-repeat-with-transformations-expected.png b/third_party/blink/web_tests/virtual/gpu/fast/canvas/canvas-pattern-no-repeat-with-transformations-expected.png
index bc1f13bb..2ac683c 100644
--- a/third_party/blink/web_tests/virtual/gpu/fast/canvas/canvas-pattern-no-repeat-with-transformations-expected.png
+++ b/third_party/blink/web_tests/virtual/gpu/fast/canvas/canvas-pattern-no-repeat-with-transformations-expected.png
Binary files differ

third_party/blink/web_tests/virtual/gpu/fast/canvas/canvas-toDataURL-webp-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/gpu/fast/canvas/canvas-toDataURL-webp-expected.png b/third_party/blink/web_tests/virtual/gpu/fast/canvas/canvas-toDataURL-webp-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/virtual/gpu/fast/canvas/canvas-toDataURL-webp-expected.png
rename to third_party/blink/web_tests/virtual/gpu/fast/canvas/canvas-toDataURL-webp-expected.png
Binary files differ

third_party/blink/web_tests/virtual/oopr-canvas2d/fast/canvas/canvas-arc-circumference-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/oopr-canvas2d/fast/canvas/canvas-arc-circumference-expected.png b/third_party/blink/web_tests/virtual/oopr-canvas2d/fast/canvas/canvas-arc-circumference-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/virtual/oopr-canvas2d/fast/canvas/canvas-arc-circumference-expected.png
rename to third_party/blink/web_tests/virtual/oopr-canvas2d/fast/canvas/canvas-arc-circumference-expected.png
Binary files differ

third_party/blink/web_tests/virtual/oopr-canvas2d/fast/canvas/canvas-arc-circumference-fill-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/oopr-canvas2d/fast/canvas/canvas-arc-circumference-fill-expected.png b/third_party/blink/web_tests/virtual/oopr-canvas2d/fast/canvas/canvas-arc-circumference-fill-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/virtual/oopr-canvas2d/fast/canvas/canvas-arc-circumference-fill-expected.png
rename to third_party/blink/web_tests/virtual/oopr-canvas2d/fast/canvas/canvas-arc-circumference-fill-expected.png
Binary files differ

third_party/blink/web_tests/virtual/oopr-canvas2d/fast/canvas/canvas-composite-transformclip-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/oopr-canvas2d/fast/canvas/canvas-composite-transformclip-expected.png b/third_party/blink/web_tests/virtual/oopr-canvas2d/fast/canvas/canvas-composite-transformclip-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/virtual/oopr-canvas2d/fast/canvas/canvas-composite-transformclip-expected.png
rename to third_party/blink/web_tests/virtual/oopr-canvas2d/fast/canvas/canvas-composite-transformclip-expected.png
Binary files differ

third_party/blink/web_tests/virtual/oopr-canvas2d/fast/canvas/canvas-ellipse-circumference-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/oopr-canvas2d/fast/canvas/canvas-ellipse-circumference-expected.png b/third_party/blink/web_tests/virtual/oopr-canvas2d/fast/canvas/canvas-ellipse-circumference-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/virtual/oopr-canvas2d/fast/canvas/canvas-ellipse-circumference-expected.png
rename to third_party/blink/web_tests/virtual/oopr-canvas2d/fast/canvas/canvas-ellipse-circumference-expected.png
Binary files differ

third_party/blink/web_tests/virtual/oopr-canvas2d/fast/canvas/canvas-ellipse-circumference-fill-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/oopr-canvas2d/fast/canvas/canvas-ellipse-circumference-fill-expected.png b/third_party/blink/web_tests/virtual/oopr-canvas2d/fast/canvas/canvas-ellipse-circumference-fill-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/virtual/oopr-canvas2d/fast/canvas/canvas-ellipse-circumference-fill-expected.png
rename to third_party/blink/web_tests/virtual/oopr-canvas2d/fast/canvas/canvas-ellipse-circumference-fill-expected.png
Binary files differ

third_party/blink/web_tests/virtual/oopr-canvas2d/fast/canvas/canvas-toDataURL-webp-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/oopr-canvas2d/fast/canvas/canvas-toDataURL-webp-expected.png b/third_party/blink/web_tests/virtual/oopr-canvas2d/fast/canvas/canvas-toDataURL-webp-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/virtual/oopr-canvas2d/fast/canvas/canvas-toDataURL-webp-expected.png
rename to third_party/blink/web_tests/virtual/oopr-canvas2d/fast/canvas/canvas-toDataURL-webp-expected.png
Binary files differ

third_party/blink/web_tests/virtual/scalefactor200/css3/filters/backdrop-filter-basic-blur-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/scalefactor200/css3/filters/backdrop-filter-basic-blur-expected.png b/third_party/blink/web_tests/virtual/scalefactor200/css3/filters/backdrop-filter-basic-blur-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/virtual/scalefactor200/css3/filters/backdrop-filter-basic-blur-expected.png
rename to third_party/blink/web_tests/virtual/scalefactor200/css3/filters/backdrop-filter-basic-blur-expected.png
Binary files differ

third_party/blink/web_tests/virtual/scalefactor200/css3/filters/backdrop-filter-browser-zoom-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/scalefactor200/css3/filters/backdrop-filter-browser-zoom-expected.png b/third_party/blink/web_tests/virtual/scalefactor200/css3/filters/backdrop-filter-browser-zoom-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/virtual/scalefactor200/css3/filters/backdrop-filter-browser-zoom-expected.png
rename to third_party/blink/web_tests/virtual/scalefactor200/css3/filters/backdrop-filter-browser-zoom-expected.png
Binary files differ

third_party/blink/web_tests/virtual/scalefactor200/css3/filters/backdrop-filter-transform-expected.png

diff --git a/third_party/blink/web_tests/virtual/scalefactor200/css3/filters/backdrop-filter-transform-expected.png b/third_party/blink/web_tests/virtual/scalefactor200/css3/filters/backdrop-filter-transform-expected.png
index 5f51b55..bf75aa01 100644
--- a/third_party/blink/web_tests/virtual/scalefactor200/css3/filters/backdrop-filter-transform-expected.png
+++ b/third_party/blink/web_tests/virtual/scalefactor200/css3/filters/backdrop-filter-transform-expected.png
Binary files differ

third_party/blink/web_tests/virtual/scalefactor200/css3/filters/effect-all-on-background-hw-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/scalefactor200/css3/filters/effect-all-on-background-hw-expected.png b/third_party/blink/web_tests/virtual/scalefactor200/css3/filters/effect-all-on-background-hw-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/virtual/scalefactor200/css3/filters/effect-all-on-background-hw-expected.png
rename to third_party/blink/web_tests/virtual/scalefactor200/css3/filters/effect-all-on-background-hw-expected.png
Binary files differ

third_party/blink/web_tests/virtual/scalefactor200/css3/filters/effect-reference-hidpi-hw-expected.png

diff --git a/third_party/blink/web_tests/virtual/scalefactor200/css3/filters/effect-reference-hidpi-hw-expected.png b/third_party/blink/web_tests/virtual/scalefactor200/css3/filters/effect-reference-hidpi-hw-expected.png
deleted file mode 100644
index 10c080f..0000000
--- a/third_party/blink/web_tests/virtual/scalefactor200/css3/filters/effect-reference-hidpi-hw-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/virtual/scalefactor200/css3/filters/effect-reference-ordering-hw-expected.png

diff --git a/third_party/blink/web_tests/virtual/scalefactor200/css3/filters/effect-reference-ordering-hw-expected.png b/third_party/blink/web_tests/virtual/scalefactor200/css3/filters/effect-reference-ordering-hw-expected.png
index cb600873..4befff7 100644
--- a/third_party/blink/web_tests/virtual/scalefactor200/css3/filters/effect-reference-ordering-hw-expected.png
+++ b/third_party/blink/web_tests/virtual/scalefactor200/css3/filters/effect-reference-ordering-hw-expected.png
Binary files differ

third_party/blink/web_tests/virtual/scalefactor200/css3/filters/filter-change-repaint-composited-expected.png

diff --git a/third_party/blink/web_tests/virtual/scalefactor200/css3/filters/filter-change-repaint-composited-expected.png b/third_party/blink/web_tests/virtual/scalefactor200/css3/filters/filter-change-repaint-composited-expected.png
index dd46d20d..57e724c7 100644
--- a/third_party/blink/web_tests/virtual/scalefactor200/css3/filters/filter-change-repaint-composited-expected.png
+++ b/third_party/blink/web_tests/virtual/scalefactor200/css3/filters/filter-change-repaint-composited-expected.png
Binary files differ

third_party/blink/web_tests/virtual/scalefactor200/css3/filters/filter-repaint-composited-fallback-crash-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/scalefactor200/css3/filters/filter-repaint-composited-fallback-crash-expected.png b/third_party/blink/web_tests/virtual/scalefactor200/css3/filters/filter-repaint-composited-fallback-crash-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/virtual/scalefactor200/css3/filters/filter-repaint-composited-fallback-crash-expected.png
rename to third_party/blink/web_tests/virtual/scalefactor200/css3/filters/filter-repaint-composited-fallback-crash-expected.png
Binary files differ

third_party/blink/web_tests/virtual/scalefactor200/css3/filters/filter-repaint-composited-fallback-expected.png

diff --git a/third_party/blink/web_tests/platform/win/virtual/scalefactor200/css3/filters/filter-repaint-composited-fallback-expected.png b/third_party/blink/web_tests/virtual/scalefactor200/css3/filters/filter-repaint-composited-fallback-expected.png
similarity index 100%
rename from third_party/blink/web_tests/platform/win/virtual/scalefactor200/css3/filters/filter-repaint-composited-fallback-expected.png
rename to third_party/blink/web_tests/virtual/scalefactor200/css3/filters/filter-repaint-composited-fallback-expected.png
Binary files differ

third_party/blink/web_tests/virtual/shared_array_buffer_on_desktop/fast/webgl/pixelated-expected.png

diff --git a/third_party/blink/web_tests/virtual/shared_array_buffer_on_desktop/fast/webgl/pixelated-expected.png b/third_party/blink/web_tests/virtual/shared_array_buffer_on_desktop/fast/webgl/pixelated-expected.png
deleted file mode 100644
index 791a4cf..0000000
--- a/third_party/blink/web_tests/virtual/shared_array_buffer_on_desktop/fast/webgl/pixelated-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/virtual/shared_array_buffer_on_desktop/fast/webgl/webgl-composite-modes-expected.png

diff --git a/third_party/blink/web_tests/virtual/shared_array_buffer_on_desktop/fast/webgl/webgl-composite-modes-expected.png b/third_party/blink/web_tests/virtual/shared_array_buffer_on_desktop/fast/webgl/webgl-composite-modes-expected.png
deleted file mode 100644
index d8d3ac81..0000000
--- a/third_party/blink/web_tests/virtual/shared_array_buffer_on_desktop/fast/webgl/webgl-composite-modes-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/virtual/threaded/compositing/webgl/webgl-no-alpha-expected.png

diff --git a/third_party/blink/web_tests/virtual/threaded/compositing/webgl/webgl-no-alpha-expected.png b/third_party/blink/web_tests/virtual/threaded/compositing/webgl/webgl-no-alpha-expected.png
new file mode 100644
index 0000000..aa254fa0a
--- /dev/null
+++ b/third_party/blink/web_tests/virtual/threaded/compositing/webgl/webgl-no-alpha-expected.png
Binary files differ

tools/mb/mb_config.pyl

diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl
index 22f6438..a1ef8c4 100644
--- a/tools/mb/mb_config.pyl
+++ b/tools/mb/mb_config.pyl
@@ -81,7 +81,7 @@
       'Deterministic Android': 'android_without_codecs_release_bot_minimal_symbols',
       'Deterministic Android (dbg)': 'android_debug_bot',
 
-      'android-arm64-proguard-rel': 'android_release_bot_minimal_symbols_arm64_webview_monochrome',
+      'android-arm64-proguard-rel': 'android_release_bot_minimal_symbols_arm64_webview_google',
       'android-bfcache-rel': 'android_release_bot_minimal_symbols',
       'android-binary-size-generator': 'android_binary_size',
       'android-cronet-arm-dbg': 'android_cronet_debug_static_bot_arm_no_neon',
@@ -1041,7 +1041,6 @@
       'linux-perfetto-rel': 'perfetto_release_trybot',
       'linux-rel': 'gpu_tests_release_trybot_no_symbols_use_dummy_lastchange_code_coverage',
       'linux-rel-orchestrator': 'gpu_tests_release_trybot_no_symbols_use_dummy_lastchange_code_coverage',
-      'linux-rel-reclient': 'gpu_tests_release_trybot_no_symbols_use_dummy_lastchange_code_coverage_reclient',
       'linux-rel-rts': 'gpu_tests_release_trybot_no_symbols_use_dummy_lastchange_code_coverage',
       'linux-stable-filter-rel': 'gpu_tests_release_trybot_no_symbols_use_dummy_lastchange_code_coverage',
       'linux-stable-filter-combined-rel': 'gpu_tests_release_trybot_no_symbols_use_dummy_lastchange_code_coverage',
@@ -2460,11 +2459,6 @@
       'linux_wayland', 'ozone_headless',
     ],
 
-    'gpu_tests_release_trybot_no_symbols_use_dummy_lastchange_code_coverage_reclient': [
-      'gpu_tests', 'release_trybot_reclient', 'no_symbols', 'use_dummy_lastchange',
-      'use_clang_coverage', 'partial_code_coverage_instrumentation',
-    ],
-
     'gpu_tests_release_trybot_no_symbols_use_dummy_lastchange_invert_fieldtrials': [
       'gpu_tests', 'release_trybot', 'no_symbols', 'use_dummy_lastchange',
       'invert_fieldtrials',
@@ -3931,11 +3925,6 @@
                  'blink_disable_generated_code_formatting'],
     },
 
-    'release_trybot_reclient': {
-      'mixins': ['release_bot_reclient', 'minimal_symbols', 'dcheck_always_on',
-                 'blink_disable_generated_code_formatting'],
-    },
-
     'resource_allowlisting': {
       'gn_args': 'enable_resource_allowlist_generation=true',
     },

tools/mb/mb_config_expectations/chromium.android.json

diff --git a/tools/mb/mb_config_expectations/chromium.android.json b/tools/mb/mb_config_expectations/chromium.android.json
index af50b1c..9e8e168 100644
--- a/tools/mb/mb_config_expectations/chromium.android.json
+++ b/tools/mb/mb_config_expectations/chromium.android.json
@@ -145,7 +145,7 @@
       "proprietary_codecs": true,
       "strip_debug_info": true,
       "symbol_level": 1,
-      "system_webview_package_name": "com.google.android.apps.chrome",
+      "system_webview_package_name": "com.google.android.webview",
       "target_cpu": "arm64",
       "target_os": "android",
       "use_goma": true

tools/mb/mb_config_expectations/tryserver.chromium.linux.json

diff --git a/tools/mb/mb_config_expectations/tryserver.chromium.linux.json b/tools/mb/mb_config_expectations/tryserver.chromium.linux.json
index 0c3d7a8..d6f5c44 100644
--- a/tools/mb/mb_config_expectations/tryserver.chromium.linux.json
+++ b/tools/mb/mb_config_expectations/tryserver.chromium.linux.json
@@ -733,22 +733,6 @@
       "use_goma": true
     }
   },
-  "linux-rel-reclient": {
-    "gn_args": {
-      "blink_enable_generated_code_formatting": false,
-      "coverage_instrumentation_input_file": "//.code-coverage/files_to_instrument.txt",
-      "dcheck_always_on": true,
-      "ffmpeg_branding": "Chrome",
-      "is_component_build": false,
-      "is_debug": false,
-      "proprietary_codecs": true,
-      "symbol_level": 0,
-      "use_clang_coverage": true,
-      "use_dummy_lastchange": true,
-      "use_rbe": true,
-      "use_remoteexec": true
-    }
-  },
   "linux-rel-rts": {
     "gn_args": {
       "blink_enable_generated_code_formatting": false,

tools/metrics/histograms/enums.xml

diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml
index 49ec69d..9df6c6c3 100644
--- a/tools/metrics/histograms/enums.xml
+++ b/tools/metrics/histograms/enums.xml
@@ -8294,6 +8294,7 @@
   <int value="255" label="RFPH_FOCUSED_FENCED_FRAME"/>
   <int value="256" label="WCI_REQUEST_LOCK_MOUSE_FENCED_FRAME"/>
   <int value="257" label="BFSI_CREATE_FOR_FRAME_FENCED_FRAME"/>
+  <int value="258" label="RFH_FENCED_FRAME_MOJO_WHEN_DISABLED"/>
 </enum>
 
 <enum name="BadMessageReasonExtensions">

tools/metrics/histograms/metadata/compositing/histograms.xml

diff --git a/tools/metrics/histograms/metadata/compositing/histograms.xml b/tools/metrics/histograms/metadata/compositing/histograms.xml
index 023be29..20f9cd42 100644
--- a/tools/metrics/histograms/metadata/compositing/histograms.xml
+++ b/tools/metrics/histograms/metadata/compositing/histograms.xml
@@ -767,6 +767,76 @@
   </summary>
 </histogram>
 
+<histogram name="Graphics.Smoothness.PercentDroppedFrames2.AllAnimations"
+    units="%" expires_after="2022-09-10">
+  <owner>sadrul@chromium.org</owner>
+  <owner>behdadb@chromium.org</owner>
+  <summary>
+    Tracks the percent of dropped frames for a particular sequence of frames for
+    all animations. This metric is reported for all animations (e.g.
+    comositor-driven animations, main-thread driven animations, and raf-driven
+    animations).
+
+    PercentDroppedFrames is measured by tracking the number of frames which were
+    not displayed on screen out of the total number of frames expected to be
+    produced and displayed. In other words, the lower this number is, the
+    smoother experience.
+
+    Note that this metric is reported only when there are sufficient number of
+    frames (&gt;= 100). If there are sequences with fewer frames, then these are
+    aggregated until there are enough frames to produce the metric.
+
+    This is a new implementation of the older
+    Graphics.Smoothness.PercentDroppedFrames.AllAnimations metric.
+  </summary>
+</histogram>
+
+<histogram name="Graphics.Smoothness.PercentDroppedFrames2.AllInteractions"
+    units="%" expires_after="2022-09-10">
+  <owner>sadrul@chromium.org</owner>
+  <owner>behdadb@chromium.org</owner>
+  <summary>
+    Tracks the percent of dropped frames for a particular sequence of frames
+    where a user-input (e.g. scroll, pinch) is active. This metric is reported
+    for all sources of user-input (i.e. both touchscreen and
+    touchpad/mouse-wheel).
+
+    PercentDroppedFrames is measured by tracking the number of frames which were
+    not displayed on screen out of the total number of frames expected to be
+    produced and displayed. In other words, the lower this number is, the
+    smoother experience.
+
+    Note that this metric is reported only when there are sufficient number of
+    frames (&gt;= 100). If there are sequences with fewer frames, then these are
+    aggregated until there are enough frames to produce the metric.
+
+    This is a new implementation of the older
+    Graphics.Smoothness.PercentDroppedFrames.AllInteractions metric.
+  </summary>
+</histogram>
+
+<histogram name="Graphics.Smoothness.PercentDroppedFrames2.AllSequences"
+    units="%" expires_after="2022-09-10">
+  <owner>sadrul@chromium.org</owner>
+  <owner>behdadb@chromium.org</owner>
+  <summary>
+    Tracks the percent of dropped frames for a particular sequence of frames.
+    This metric is reported for all animations and all interactions.
+
+    PercentDroppedFrames is measured by tracking the number of frames which were
+    not displayed on screen out of the total number of frames expected to be
+    produced and displayed. In other words, the lower this number is, the
+    smoother experience.
+
+    Note that this metric is reported only when there are sufficient number of
+    frames (&gt;= 100). If there are sequences with fewer frames, then these are
+    aggregated until there are enough frames to produce the metric.
+
+    This is a new implementation of the older
+    Graphics.Smoothness.PercentDroppedFrames.AllSequences metric.
+  </summary>
+</histogram>
+
 </histograms>
 
 </histogram-configuration>

tools/metrics/histograms/metadata/prefetch/histograms.xml

diff --git a/tools/metrics/histograms/metadata/prefetch/histograms.xml b/tools/metrics/histograms/metadata/prefetch/histograms.xml
index 5fb02347..4094c4b6 100644
--- a/tools/metrics/histograms/metadata/prefetch/histograms.xml
+++ b/tools/metrics/histograms/metadata/prefetch/histograms.xml
@@ -295,7 +295,8 @@
       variants="PrefetchProxyCanaryCheckerClient"/>
 </histogram>
 
-<histogram name="PrefetchProxy.CanaryChecker.CacheLookupResult"
+<histogram
+    name="PrefetchProxy.CanaryChecker.CacheLookupResult.{PrefetchProxyCanaryCheckerClient}"
     enum="CanaryCheckLookupResult" expires_after="M104">
   <owner>spelchat@chromium.org</owner>
   <owner>chrome-brapp-loading@google.com</owner>
@@ -305,6 +306,8 @@
     Cache misses or cached failures result in filter probing the origin before
     the prefetched response can be used.
   </summary>
+  <token key="PrefetchProxyCanaryCheckerClient"
+      variants="PrefetchProxyCanaryCheckerClient"/>
 </histogram>
 
 <histogram

tools/metrics/histograms/metadata/profile/histograms.xml

diff --git a/tools/metrics/histograms/metadata/profile/histograms.xml b/tools/metrics/histograms/metadata/profile/histograms.xml
index 15911f6..17f1191 100644
--- a/tools/metrics/histograms/metadata/profile/histograms.xml
+++ b/tools/metrics/histograms/metadata/profile/histograms.xml
@@ -362,6 +362,20 @@
   </summary>
 </histogram>
 
+<histogram name="Profile.LiveProfileCount" units="profiles"
+    expires_after="2022-04-01">
+  <owner>nicolaso@chromium.org</owner>
+  <owner>cbe-eng@google.com</owner>
+  <summary>
+    Number of Profiles that are currently loaded in memory, with a non-zero
+    refcount. Recorded 30 minutes after startup, and every 30 minutes
+    afterwards.
+
+    See also Profile.ZombieProfileCount, the number of Profiles with a refcount
+    of 0.
+  </summary>
+</histogram>
+
 <histogram name="Profile.Menu.ClickedActionableItem"
     enum="ProfileMenuActionableItem" expires_after="2022-06-30">
   <owner>droger@chromium.org</owner>
@@ -815,6 +829,30 @@
   <summary>Size of the web data database.</summary>
 </histogram>
 
+<histogram name="Profile.ZombieProfileCount" units="profiles"
+    expires_after="2022-04-01">
+  <owner>nicolaso@chromium.org</owner>
+  <owner>cbe-eng@google.com</owner>
+  <summary>
+    Number of Profiles that are in a &quot;zombie&quot; state. Recorded 30
+    minutes after startup, and every 30 minutes afterwards. A &quot;zombie&quot;
+    profile is one of 2 things, depending on the DestroyProfileOnBrowserClose
+    (DPoBC) variation:
+
+    If DPoBC is false: the Profile has a refcount of 0, but is still loaded in
+    memory.
+
+    If DPoBC is false: the Profile object was destroyed, and isn't loaded in
+    memory anymore.
+
+    When a Profile is destroyed but gets loaded from disk again, it stops being
+    a zombie.
+
+    See also Profile.LiveProfileCount, the number of profiles with a non-zero
+    refcount.
+  </summary>
+</histogram>
+
 <histogram name="ProfileChooser.HasProfilesShown" enum="BooleanShown"
     expires_after="2022-04-24">
   <owner>vasilii@chromium.org</owner>

tools/metrics/histograms/print_histogram_names.py

diff --git a/tools/metrics/histograms/print_histogram_names.py b/tools/metrics/histograms/print_histogram_names.py
index 2d8aba3d..712dea8b 100755
--- a/tools/metrics/histograms/print_histogram_names.py
+++ b/tools/metrics/histograms/print_histogram_names.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright 2018 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
@@ -12,11 +12,7 @@
 import subprocess
 import sys
 import tempfile
-
-try:
-  from StringIO import StringIO  # for Python 2
-except ImportError:
-  from io import StringIO  # for Python 3
+import io
 
 sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'common'))
 import path_util
@@ -67,7 +63,7 @@
 
     # Just store the contents in memory. histograms.xml is big, but it isn't
     # _that_ big.
-    return StringIO(contents)
+    return io.StringIO(contents)
 
   prev_files = []
   for p in histogram_paths.ALL_XMLS_RELATIVE:

tools/metrics/histograms/validate_format.py

diff --git a/tools/metrics/histograms/validate_format.py b/tools/metrics/histograms/validate_format.py
index 90cfb6cb..c2b21da5 100755
--- a/tools/metrics/histograms/validate_format.py
+++ b/tools/metrics/histograms/validate_format.py
@@ -14,7 +14,9 @@
 import merge_xml
 
 # The allowlist of namespaces that are split across multiple files.
-_NAMESPACES_IN_MULTIPLE_FILES = ['chromeos', 'fcminvalidations', 'launch']
+_NAMESPACES_IN_MULTIPLE_FILES = [
+    'chromeos', 'fcminvalidations', 'graphics', 'launch'
+]
 
 
 def CheckNamespaces():

tools/perf/benchmarks/blink_perf_unittest.py

diff --git a/tools/perf/benchmarks/blink_perf_unittest.py b/tools/perf/benchmarks/blink_perf_unittest.py
index cedff51..f1f6e25 100644
--- a/tools/perf/benchmarks/blink_perf_unittest.py
+++ b/tools/perf/benchmarks/blink_perf_unittest.py
@@ -100,7 +100,8 @@
     self.assertEquals(len(post_layout_task), 7)
     self.assertGreater(_Mean(post_layout_task), 0.001)
 
-  @decorators.Disabled('mac')  # Flaky on mac: crbug.com/960554
+  @decorators.Disabled('mac', # Flaky on mac: crbug.com/960554
+                       'chromeos') # Flaky on CrOS: crbug.com/1275110
   def testBlinkPerfTracingMetricsForMeasureAsync(self):
     measurements = self.RunPageTest(
         self.blink_page_test, 'file://simple-blob-measure-async.html')

tools/perf/benchmarks/rendering.py

diff --git a/tools/perf/benchmarks/rendering.py b/tools/perf/benchmarks/rendering.py
index 2ff57ce..2eee04a 100644
--- a/tools/perf/benchmarks/rendering.py
+++ b/tools/perf/benchmarks/rendering.py
@@ -70,7 +70,7 @@
   def SetExtraBrowserOptions(self, options):
     options.AppendExtraBrowserArgs('--enable-gpu-benchmarking')
     options.AppendExtraBrowserArgs('--touch-events=enabled')
-    if self.allow_software_compositing:
+    if self.allow_software_compositing or self.NeedsSoftwareCompositing():
       logging.warning('Allowing software compositing. Some of the reported '
                       'metrics will have unreliable values.')
     else:

tools/perf/benchmarks/system_health.py

diff --git a/tools/perf/benchmarks/system_health.py b/tools/perf/benchmarks/system_health.py
index 324d0e7..2c8d0140 100644
--- a/tools/perf/benchmarks/system_health.py
+++ b/tools/perf/benchmarks/system_health.py
@@ -3,8 +3,6 @@
 # found in the LICENSE file.
 import logging
 
-import os
-
 from benchmarks import loading_metrics_category
 
 from core import perf_benchmark
@@ -88,21 +86,12 @@
   def SetExtraBrowserOptions(self, options):
     # Using the software fallback can skew the rendering related metrics. So
     # disable that (unless explicitly run with --allow-software-compositing).
-    if self.allow_software_compositing or self._NeedsSoftwareCompositing():
+    if self.allow_software_compositing or self.NeedsSoftwareCompositing():
       logging.warning('Allowing software compositing. Some of the reported '
                       'metrics will have unreliable values.')
     else:
       options.AppendExtraBrowserArgs('--disable-software-compositing-fallback')
 
-  def _NeedsSoftwareCompositing(self):
-    # We have to run with software compositing under xvfb or
-    # chrome remote desktop.
-    if 'CHROME_REMOTE_DESKTOP_SESSION' in os.environ:
-      return True
-    if 'XVFB_DISPLAY' in os.environ:
-      return True
-    return False
-
   def CreateStorySet(self, options):
     return page_sets.SystemHealthStorySet(platform=self.PLATFORM)
 

tools/perf/core/perf_benchmark.py

diff --git a/tools/perf/core/perf_benchmark.py b/tools/perf/core/perf_benchmark.py
index bf799d9..d6298aa8 100644
--- a/tools/perf/core/perf_benchmark.py
+++ b/tools/perf/core/perf_benchmark.py
@@ -189,3 +189,13 @@
     if possible_browser.target_os == 'android':
       return possible_browser.platform.IsSvelte()
     return False
+
+  @staticmethod
+  def NeedsSoftwareCompositing():
+    # We have to run with software compositing under xvfb or
+    # chrome remote desktop.
+    if 'CHROME_REMOTE_DESKTOP_SESSION' in os.environ:
+      return True
+    if 'XVFB_DISPLAY' in os.environ:
+      return True
+    return False

tools/perf/core/perfetto_binary_roller/binary_deps.json

diff --git a/tools/perf/core/perfetto_binary_roller/binary_deps.json b/tools/perf/core/perfetto_binary_roller/binary_deps.json
index 00d1c45..fc0aa12 100644
--- a/tools/perf/core/perfetto_binary_roller/binary_deps.json
+++ b/tools/perf/core/perfetto_binary_roller/binary_deps.json
@@ -5,20 +5,20 @@
             "remote_path": "perfetto_binaries/trace_processor_shell/linux_arm/49b4b5dcbc312d8d2c3751cf29238b8efeb4e494/trace_processor_shell"
         },
         "win": {
-            "hash": "3ea3cddc7266885be23d8206cdcae9ceb2247dc8",
-            "remote_path": "perfetto_binaries/trace_processor_shell/win/2724a3642a951c5c0b45143cc28f77815fb78f7b/trace_processor_shell.exe"
+            "hash": "2fa72448c613dfdf2546ba7988c6c1fd420ddee6",
+            "remote_path": "perfetto_binaries/trace_processor_shell/win/0d6b3465fd3dd8f49f69b51c44bec5184e1bf39b/trace_processor_shell.exe"
         },
         "mac": {
-            "hash": "0b7b517189c4ddb53ada822ecab2e664d936d3ab",
-            "remote_path": "perfetto_binaries/trace_processor_shell/mac/0ae6700b6b9cc6f8934df113ea29ec69146d6a89/trace_processor_shell"
+            "hash": "6043cb87e9b062d4faba99fe10f46a6a44b0d873",
+            "remote_path": "perfetto_binaries/trace_processor_shell/mac/0d6b3465fd3dd8f49f69b51c44bec5184e1bf39b/trace_processor_shell"
         },
         "linux_arm64": {
             "hash": "5074025a2898ec41a872e70a5719e417acb0a380",
             "remote_path": "perfetto_binaries/trace_processor_shell/linux_arm64/49b4b5dcbc312d8d2c3751cf29238b8efeb4e494/trace_processor_shell"
         },
         "linux": {
-            "hash": "b6dbedfec5affaf5722ef846513a3c5f82ab9882",
-            "remote_path": "perfetto_binaries/trace_processor_shell/linux/2724a3642a951c5c0b45143cc28f77815fb78f7b/trace_processor_shell"
+            "hash": "c0ae33461787c2975478eb56d26d299fc04dcbc6",
+            "remote_path": "perfetto_binaries/trace_processor_shell/linux/0d6b3465fd3dd8f49f69b51c44bec5184e1bf39b/trace_processor_shell"
         }
     },
     "power_profile.sql": {

tools/perf/page_sets/rendering/rendering_story.py

diff --git a/tools/perf/page_sets/rendering/rendering_story.py b/tools/perf/page_sets/rendering/rendering_story.py
index 97eb7bf..31b4a75 100644
--- a/tools/perf/page_sets/rendering/rendering_story.py
+++ b/tools/perf/page_sets/rendering/rendering_story.py
@@ -61,3 +61,10 @@
         make_javascript_deterministic=make_javascript_deterministic,
         base_dir=base_dir,
         perform_final_navigation=perform_final_navigation)
+
+  def WillStartTracing(self, chrome_trace_config):
+    chrome_trace_config.category_filter.AddIncludedCategory('gpu')
+    chrome_trace_config.category_filter.AddIncludedCategory('blink')
+    chrome_trace_config.category_filter.AddIncludedCategory('cc')
+    chrome_trace_config.category_filter.AddIncludedCategory('v8')
+    chrome_trace_config.category_filter.AddIncludedCategory('viz')

ui/android/java/res/values-night/colors.xml

diff --git a/ui/android/java/res/values-night/colors.xml b/ui/android/java/res/values-night/colors.xml
index 2ae6e11..20f2dbba 100644
--- a/ui/android/java/res/values-night/colors.xml
+++ b/ui/android/java/res/values-night/colors.xml
@@ -28,12 +28,12 @@
     <color name="default_bg_color">@color/default_bg_color_baseline</color>
     <color name="default_bg_color_baseline">@color/default_bg_color_dark</color>
     <color name="default_bg_color_secondary">@color/default_bg_color_secondary_dark</color>
-    <color name="default_bg_color_elev_1">@color/default_bg_color_dark_elev_1</color>
-    <color name="default_bg_color_elev_2">@color/default_bg_color_dark_elev_2</color>
-    <color name="default_bg_color_elev_3">@color/default_bg_color_dark_elev_3</color>
-    <color name="default_bg_color_elev_4">@color/default_bg_color_dark_elev_4</color>
-    <color name="default_bg_color_elev_5">@color/default_bg_color_dark_elev_5</color>
-    <color name="default_bg_color_elev_6">@color/default_bg_color_dark_elev_6</color>
+    <color name="default_bg_color_elev_1_baseline">@color/default_bg_color_dark_elev_1</color>
+    <color name="default_bg_color_elev_2_baseline">@color/default_bg_color_dark_elev_2</color>
+    <color name="default_bg_color_elev_3_baseline">@color/default_bg_color_dark_elev_3</color>
+    <color name="default_bg_color_elev_4_baseline">@color/default_bg_color_dark_elev_4</color>
+    <color name="default_bg_color_elev_5_baseline">@color/default_bg_color_dark_elev_5</color>
+    <color name="default_bg_color_elev_6_baseline">@color/default_bg_color_dark_elev_6</color>
     <!-- Legacy elevation/surface colors kept around for tab switcher, which has
          a separate feature to control enabling baseline. This is most
          noticeable in the title background color for thumbnails, legacy will

ui/android/java/res/values/semantic_colors_adaptive.xml

diff --git a/ui/android/java/res/values/semantic_colors_adaptive.xml b/ui/android/java/res/values/semantic_colors_adaptive.xml
index c2aecf5..a3ae78f 100644
--- a/ui/android/java/res/values/semantic_colors_adaptive.xml
+++ b/ui/android/java/res/values/semantic_colors_adaptive.xml
@@ -44,12 +44,12 @@
 
     <!-- TODO(https://crbug.com/1210689): These all need to ultimately be
          removed because they do not work with dynamic colors. -->
-    <color name="default_bg_color_elev_1" tools:ignore="UnusedResources">@color/default_bg_color_light_elev_1</color>
-    <color name="default_bg_color_elev_2" tools:ignore="UnusedResources">@color/default_bg_color_light_elev_2</color>
-    <color name="default_bg_color_elev_3" tools:ignore="UnusedResources">@color/default_bg_color_light_elev_3</color>
-    <color name="default_bg_color_elev_4">@color/default_bg_color_light_elev_4</color>
-    <color name="default_bg_color_elev_5" tools:ignore="UnusedResources">@color/default_bg_color_light_elev_5</color>
-    <color name="default_bg_color_elev_6" tools:ignore="UnusedResources">@color/default_bg_color_light_elev_6</color>
+    <color name="default_bg_color_elev_1_baseline" tools:ignore="UnusedResources">@color/default_bg_color_light_elev_1</color>
+    <color name="default_bg_color_elev_2_baseline" tools:ignore="UnusedResources">@color/default_bg_color_light_elev_2</color>
+    <color name="default_bg_color_elev_3_baseline" tools:ignore="UnusedResources">@color/default_bg_color_light_elev_3</color>
+    <color name="default_bg_color_elev_4_baseline">@color/default_bg_color_light_elev_4</color>
+    <color name="default_bg_color_elev_5_baseline" tools:ignore="UnusedResources">@color/default_bg_color_light_elev_5</color>
+    <color name="default_bg_color_elev_6_baseline" tools:ignore="UnusedResources">@color/default_bg_color_light_elev_6</color>
     <color name="legacy_bg_color_elev_1">@color/legacy_bg_color_light_elev_1</color>
     <color name="legacy_bg_color_elev_4">@color/legacy_bg_color_light_elev_4</color>
 
@@ -80,18 +80,18 @@
     <color name="default_chip_assistive_text_color_secondary">@color/default_text_color_secondary</color>
     <color name="chip_bg_color">@color/default_bg_color</color>
     <color name="chip_background_color_disabled">@android:color/transparent</color>
-    <color name="default_chip_ripple_color">@color/default_bg_color_elev_2</color>
+    <color name="default_chip_ripple_color">@color/default_bg_color_elev_2_baseline</color>
     <color name="default_chip_outline_color" tools:ignore="UnusedResources">@color/default_chip_outline_color_light</color>
     <color name="chip_selected_hover">@color/chip_selected_hover_dark</color>
     <color name="chip_selected_focused">@color/chip_selected_focused_dark</color>
     <color name="chip_selected_hover_and_focused">@color/chip_selected_hover_and_focused_dark</color>
-    <color name="chip_focused">@color/default_bg_color_elev_4</color>
-    <color name="chip_hover_focused">@color/default_bg_color_elev_4</color>
+    <color name="chip_focused">@color/default_bg_color_elev_4_baseline</color>
+    <color name="chip_hover_focused">@color/default_bg_color_elev_4_baseline</color>
     <color name="chip_selected">@color/chip_selected_light</color>
 
     <!-- CircularProgressView colors -->
-    <color name="circular_progress_inner_background_color_small" tools:ignore="UnusedResources">@color/default_bg_color_elev_1</color>
-    <color name="circular_progress_outer_circle_background_color_small" tools:ignore="UnusedResources">@color/default_bg_color_elev_1</color>
+    <color name="circular_progress_inner_background_color_small" tools:ignore="UnusedResources">@color/default_bg_color_elev_1_baseline</color>
+    <color name="circular_progress_outer_circle_background_color_small" tools:ignore="UnusedResources">@color/default_bg_color_elev_1_baseline</color>
     <color name="circular_progress_outer_circle_progress_color_small" tools:ignore="UnusedResources">@color/circular_progress_outer_circle_progress_color_small_light</color>
     <color name="circular_progress_icon_color_small_large" tools:ignore="UnusedResources">@color/circular_progress_icon_color_small_large_light</color>
 

ui/views/controls/message_box_view.cc

diff --git a/ui/views/controls/message_box_view.cc b/ui/views/controls/message_box_view.cc
index 905e12f..0d4792c2 100644
--- a/ui/views/controls/message_box_view.cc
+++ b/ui/views/controls/message_box_view.cc
@@ -10,6 +10,7 @@
 #include <numeric>
 #include <utility>
 
+#include "base/bind.h"
 #include "base/i18n/rtl.h"
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
@@ -25,10 +26,9 @@
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/scroll_view.h"
 #include "ui/views/controls/textfield/textfield.h"
-#include "ui/views/layout/box_layout.h"
-#include "ui/views/layout/fill_layout.h"
-#include "ui/views/layout/grid_layout.h"
+#include "ui/views/layout/box_layout_view.h"
 #include "ui/views/layout/layout_provider.h"
+#include "ui/views/view_class_properties.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/client_view.h"
 #include "ui/views/window/dialog_delegate.h"
@@ -83,59 +83,81 @@
       message_width_(kDefaultMessageWidth) {
   const LayoutProvider* provider = LayoutProvider::Get();
 
-  auto message_contents = std::make_unique<View>();
-  // We explicitly set insets on the message contents instead of the scroll view
-  // so that the scroll view borders are not capped by dialog insets.
-  message_contents->SetBorder(CreateEmptyBorder(GetHorizontalInsets(provider)));
-  message_contents->SetLayoutManager(std::make_unique<views::BoxLayout>(
-      views::BoxLayout::Orientation::kVertical));
+  auto horizontal_insets = GetHorizontalInsets(provider);
+
+  auto message_contents =
+      Builder<BoxLayoutView>()
+          .SetOrientation(BoxLayout::Orientation::kVertical)
+          // We explicitly set insets on the message contents instead of the
+          // scroll view so that the scroll view borders are not capped by
+          // dialog insets.
+          .SetBorder(CreateEmptyBorder(GetHorizontalInsets(provider)));
+
   auto add_label = [&message_contents, this](
-                       const std::u16string& text, bool multi_line,
+                       const std::u16string& text,
                        gfx::HorizontalAlignment alignment) {
-    auto message_label =
-        std::make_unique<Label>(text, style::CONTEXT_DIALOG_BODY_TEXT);
-    message_label->SetMultiLine(!text.empty());
-    message_label->SetAllowCharacterBreak(true);
-    message_label->SetHorizontalAlignment(alignment);
-    message_labels_.push_back(
-        message_contents->AddChildView(std::move(message_label)));
+    message_contents.AddChild(
+        Builder<Label>()
+            .SetText(text)
+            .SetTextContext(style::CONTEXT_DIALOG_BODY_TEXT)
+            .SetMultiLine(!text.empty())
+            .SetAllowCharacterBreak(true)
+            .SetHorizontalAlignment(alignment)
+            .CustomConfigure(base::BindOnce(
+                [](std::vector<Label*>& message_labels, Label* message_label) {
+                  message_labels.push_back(message_label);
+                },
+                std::ref(message_labels_))));
   };
+
   if (detect_directionality) {
     std::vector<std::u16string> texts;
     SplitStringIntoParagraphs(message, &texts);
     for (const auto& text : texts) {
       // Avoid empty multi-line labels, which have a height of 0.
-      add_label(text, !text.empty(), gfx::ALIGN_TO_HEAD);
+      add_label(text, gfx::ALIGN_TO_HEAD);
     }
   } else {
-    add_label(message, true, gfx::ALIGN_LEFT);
+    add_label(message, gfx::ALIGN_LEFT);
   }
-  scroll_view_ = AddChildView(std::make_unique<ScrollView>());
-  scroll_view_->ClipHeightTo(
-      0,
-      provider->GetDistanceMetric(DISTANCE_DIALOG_SCROLLABLE_AREA_MAX_HEIGHT));
-  scroll_view_->SetContents(std::move(message_contents));
+
+  Builder<MessageBoxView>(this)
+      .SetOrientation(BoxLayout::Orientation::kVertical)
+      .AddChildren(
+          Builder<ScrollView>()
+              .CopyAddressTo(&scroll_view_)
+              .ClipHeightTo(0, provider->GetDistanceMetric(
+                                   DISTANCE_DIALOG_SCROLLABLE_AREA_MAX_HEIGHT))
+              .SetContents(std::move(message_contents)),
+          // TODO(crbug.com/1218186): Remove this, this is in place temporarily
+          // to be able to submit accessibility checks, but this focusable View
+          // needs to add a name so that the screen reader knows what to
+          // announce.
+          Builder<Textfield>()
+              .CopyAddressTo(&prompt_field_)
+              .SetProperty(kSkipAccessibilityPaintChecks, true)
+              .SetProperty(kMarginsKey, horizontal_insets)
+              .SetAccessibleName(message)
+              .SetVisible(false)
+              .CustomConfigure(base::BindOnce([](Textfield* prompt_field) {
+                prompt_field->GetViewAccessibility().OverrideIsIgnored(true);
+              })),
+          Builder<Checkbox>()
+              .CopyAddressTo(&checkbox_)
+              .SetProperty(kMarginsKey, horizontal_insets)
+              .SetVisible(false),
+          Builder<Link>()
+              .CopyAddressTo(&link_)
+              .SetProperty(kMarginsKey, horizontal_insets)
+              .SetHorizontalAlignment(gfx::ALIGN_LEFT)
+              .SetVisible(false))
+      .BuildChildren();
+
   // Don't enable text selection if multiple labels are used, since text
   // selection can't span multiple labels.
   if (message_labels_.size() == 1u)
     message_labels_[0]->SetSelectable(true);
 
-  prompt_field_ = AddChildView(std::make_unique<Textfield>());
-  // TODO(crbug.com/1218186): Remove this, this is in place temporarily to be
-  // able to submit accessibility checks, but this focusable View needs to
-  // add a name so that the screen reader knows what to announce.
-  prompt_field_->SetProperty(views::kSkipAccessibilityPaintChecks, true);
-  prompt_field_->SetAccessibleName(message);
-  prompt_field_->SetVisible(false);
-  prompt_field_->GetViewAccessibility().OverrideIsIgnored(true);
-
-  checkbox_ = AddChildView(std::make_unique<Checkbox>());
-  checkbox_->SetVisible(false);
-
-  link_ = AddChildView(std::make_unique<Link>());
-  link_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-  link_->SetVisible(false);
-
   ResetLayoutManager();
 }
 
@@ -257,55 +279,22 @@
 // MessageBoxView, private:
 
 void MessageBoxView::ResetLayoutManager() {
-  // Initialize the Grid Layout Manager used for this dialog box.
-  GridLayout* layout = SetLayoutManager(std::make_unique<views::GridLayout>());
-
-  // Add the column set for the message displayed at the top of the dialog box.
-  constexpr int kMessageViewColumnSetId = 0;
-  ColumnSet* column_set = layout->AddColumnSet(kMessageViewColumnSetId);
-  column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
-                        GridLayout::ColumnSize::kFixed, message_width_, 0);
-
-  const LayoutProvider* provider = LayoutProvider::Get();
-
-  // Column set for extra elements, if any.
-  constexpr int kExtraViewColumnSetId = 1;
-  if (prompt_field_->GetVisible() || checkbox_->GetVisible() ||
-      link_->GetVisible()) {
-    auto horizontal_insets = GetHorizontalInsets(provider);
-    column_set = layout->AddColumnSet(kExtraViewColumnSetId);
-    column_set->AddPaddingColumn(0, horizontal_insets.left());
-    column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
-                          GridLayout::ColumnSize::kUsePreferred, 0, 0);
-    column_set->AddPaddingColumn(0, horizontal_insets.right());
-  }
-
-  layout->StartRow(0, kMessageViewColumnSetId);
-  layout->AddExistingView(scroll_view_);
+  SetBetweenChildSpacing(inter_row_vertical_spacing_);
+  SetMinimumCrossAxisSize(message_width_);
+  scroll_view_->SetPreferredSize(gfx::Size(message_width_, 0));
 
   views::DialogContentType trailing_content_type =
       views::DialogContentType::kText;
-  if (prompt_field_->GetVisible()) {
-    layout->AddPaddingRow(0, inter_row_vertical_spacing_);
-    layout->StartRow(0, kExtraViewColumnSetId);
-    layout->AddExistingView(prompt_field_);
+  if (prompt_field_->GetVisible())
     trailing_content_type = views::DialogContentType::kControl;
-  }
 
-  if (checkbox_->GetVisible()) {
-    layout->AddPaddingRow(0, inter_row_vertical_spacing_);
-    layout->StartRow(0, kExtraViewColumnSetId);
-    layout->AddExistingView(checkbox_);
+  if (checkbox_->GetVisible())
     trailing_content_type = views::DialogContentType::kText;
-  }
 
-  if (link_->GetVisible()) {
-    layout->AddPaddingRow(0, inter_row_vertical_spacing_);
-    layout->StartRow(0, kExtraViewColumnSetId);
-    layout->AddExistingView(link_);
+  if (link_->GetVisible())
     trailing_content_type = views::DialogContentType::kText;
-  }
 
+  const LayoutProvider* provider = LayoutProvider::Get();
   gfx::Insets border_insets = provider->GetDialogInsetsForContentType(
       views::DialogContentType::kText, trailing_content_type);
   // Horizontal insets have already been applied to the message contents and

ui/views/controls/message_box_view.h

diff --git a/ui/views/controls/message_box_view.h b/ui/views/controls/message_box_view.h
index e9c94b5..f04fd13 100644
--- a/ui/views/controls/message_box_view.h
+++ b/ui/views/controls/message_box_view.h
@@ -12,8 +12,11 @@
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/raw_ptr.h"
+#include "ui/base/metadata/metadata_header_macros.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/views/controls/link.h"
+#include "ui/views/layout/box_layout_view.h"
+#include "ui/views/metadata/view_factory.h"
 #include "ui/views/view.h"
 
 namespace views {
@@ -27,7 +30,7 @@
 // This class displays the contents of a message box. It is intended for use
 // within a constrained window, and has options for a message, prompt, OK
 // and Cancel buttons.
-class VIEWS_EXPORT MessageBoxView : public View {
+class VIEWS_EXPORT MessageBoxView : public BoxLayoutView {
  public:
   METADATA_HEADER(MessageBoxView);
 
@@ -121,6 +124,17 @@
   int message_width_ = 0;
 };
 
+BEGIN_VIEW_BUILDER(VIEWS_EXPORT, MessageBoxView, BoxLayoutView)
+VIEW_BUILDER_PROPERTY(const std::u16string&, CheckBoxLabel)
+VIEW_BUILDER_PROPERTY(bool, CheckBoxSelected)
+VIEW_BUILDER_METHOD(SetLink, const std::u16string&, Link::ClickedCallback)
+VIEW_BUILDER_PROPERTY(int, InterRowVerticalSpacing)
+VIEW_BUILDER_PROPERTY(int, MessageWidth)
+VIEW_BUILDER_PROPERTY(const std::u16string&, PromptField)
+END_VIEW_BUILDER
+
 }  // namespace views
 
+DEFINE_VIEW_BUILDER(VIEWS_EXPORT, views::MessageBoxView)
+
 #endif  // UI_VIEWS_CONTROLS_MESSAGE_BOX_VIEW_H_

ui/webui/resources/BUILD.gn

diff --git a/ui/webui/resources/BUILD.gn b/ui/webui/resources/BUILD.gn
index f55ad20..830ee0f 100644
--- a/ui/webui/resources/BUILD.gn
+++ b/ui/webui/resources/BUILD.gn
@@ -204,12 +204,17 @@
   tsconfig_base = "tsconfig_base.json"
 
   in_files = [
-    "cr_elements/cr_a11y_announcer/cr_a11y_announcer.ts",
     "cr_components/iph_bubble/iph_bubble.ts",
+    "cr_elements/cr_a11y_announcer/cr_a11y_announcer.ts",
     "cr_elements/cr_container_shadow_mixin.ts",
     "cr_elements/cr_nav_menu_item_style.ts",
     "cr_elements/find_shortcut_mixin.ts",
     "cr_elements/mouse_hoverable_mixin.ts",
+    "cr_elements/mwb_element_shared_style.ts",
+    "cr_elements/mwb_shared_icons.ts",
+    "cr_elements/mwb_shared_style.ts",
+    "cr_elements/mwb_shared_vars.ts",
+    "cr_elements/search_highlight_style_css.ts",
     "js/i18n_mixin.ts",
     "js/list_property_update_mixin.ts",
     "js/web_ui_listener_mixin.ts",
@@ -243,10 +248,6 @@
     "$root_dir/cr_elements/hidden_style_css.m.d.ts",
     "$root_dir/cr_elements/icons.m.d.ts",
     "$root_dir/cr_elements/md_select_css.m.d.ts",
-    "$root_dir/cr_elements/mwb_shared_icons.d.ts",
-    "$root_dir/cr_elements/mwb_shared_style.d.ts",
-    "$root_dir/cr_elements/mwb_shared_vars.d.ts",
-    "$root_dir/cr_elements/search_highlight_style_css.d.ts",
     "$root_dir/cr_elements/shared_style_css.m.d.ts",
     "$root_dir/cr_elements/shared_vars_css.m.d.ts",
     "$root_dir/js/action_link.d.ts",
@@ -309,11 +310,6 @@
     "cr_elements/hidden_style_css.m.js",
     "cr_elements/icons.m.js",
     "cr_elements/md_select_css.m.js",
-    "cr_elements/mwb_element_shared_style.js",
-    "cr_elements/mwb_shared_icons.js",
-    "cr_elements/mwb_shared_style.js",
-    "cr_elements/mwb_shared_vars.js",
-    "cr_elements/search_highlight_style_css.js",
     "cr_elements/shared_style_css.m.js",
     "cr_elements/shared_vars_css.m.js",
     "js/action_link.js",

ui/webui/resources/cr_elements/BUILD.gn

diff --git a/ui/webui/resources/cr_elements/BUILD.gn b/ui/webui/resources/cr_elements/BUILD.gn
index 0c77fb7..ac774e2 100644
--- a/ui/webui/resources/cr_elements/BUILD.gn
+++ b/ui/webui/resources/cr_elements/BUILD.gn
@@ -34,7 +34,9 @@
 group("preprocess") {
   public_deps = [
     ":preprocess_generated",
+    ":preprocess_generated_ts",
     ":preprocess_src",
+    ":preprocess_src_ts",
   ]
 
   # TODO(crbug.com/1184053): Fully remove once no longer used by CrOS.
@@ -49,11 +51,8 @@
   out_manifest = "$target_gen_dir/$preprocess_src_manifest"
   in_files = [
     "cr_auto_img/cr_auto_img.js",
-    "cr_container_shadow_mixin.ts",
     "cr_search_field/cr_search_field_behavior.js",
     "cr_splitter/cr_splitter.js",
-    "find_shortcut_mixin.ts",
-    "mouse_hoverable_mixin.ts",
   ]
 
   if (is_chromeos_ash) {
@@ -64,6 +63,18 @@
   }
 }
 
+# TS files are passed to a separate target so that they are not listed in the
+# |out_manifest|.
+preprocess_if_expr("preprocess_src_ts") {
+  in_folder = "./"
+  out_folder = preprocess_folder
+  in_files = [
+    "cr_container_shadow_mixin.ts",
+    "find_shortcut_mixin.ts",
+    "mouse_hoverable_mixin.ts",
+  ]
+}
+
 preprocess_if_expr("preprocess_polymer2") {
   in_folder = "./"
   out_folder = "$preprocess_folder"
@@ -131,11 +142,10 @@
 preprocess_if_expr("preprocess_generated") {
   deps = [ ":polymer3_elements" ]
   in_folder = target_gen_dir
-  out_folder = "$preprocess_folder"
+  out_folder = preprocess_folder
   out_manifest = "$target_gen_dir/$preprocess_gen_manifest"
   in_files = [
     "action_link_css.m.js",
-    "cr_a11y_announcer/cr_a11y_announcer.ts",
     "cr_actionable_row_style.m.js",
     "cr_action_menu/cr_action_menu.js",
     "cr_button/cr_button.m.js",
@@ -155,7 +165,6 @@
     "cr_link_row/cr_link_row.js",
     "cr_lottie/cr_lottie.m.js",
     "cr_menu_selector/cr_menu_selector.js",
-    "cr_nav_menu_item_style.ts",
     "cr_page_host_style_css.js",
     "cr_profile_avatar_selector/cr_profile_avatar_selector_grid.js",
     "cr_profile_avatar_selector/cr_profile_avatar_selector.js",
@@ -178,15 +187,10 @@
     "hidden_style_css.m.js",
     "icons.m.js",
     "md_select_css.m.js",
-    "mwb_element_shared_style.js",
-    "mwb_shared_icons.js",
-    "mwb_shared_style.js",
-    "mwb_shared_vars.js",
     "policy/cr_policy_indicator_behavior.m.js",
     "policy/cr_policy_indicator.m.js",
     "policy/cr_policy_pref_indicator.m.js",
     "policy/cr_tooltip_icon.m.js",
-    "search_highlight_style_css.js",
     "shared_style_css.m.js",
     "shared_vars_css.m.js",
   ]
@@ -206,6 +210,23 @@
   }
 }
 
+# TS files are passed to a separate target so that they are not listed in the
+# |out_manifest|.
+preprocess_if_expr("preprocess_generated_ts") {
+  deps = [ ":polymer3_elements" ]
+  in_folder = target_gen_dir
+  out_folder = preprocess_folder
+  in_files = [
+    "cr_a11y_announcer/cr_a11y_announcer.ts",
+    "cr_nav_menu_item_style.ts",
+    "mwb_element_shared_style.ts",
+    "mwb_shared_icons.ts",
+    "mwb_shared_style.ts",
+    "mwb_shared_vars.ts",
+    "search_highlight_style_css.ts",
+  ]
+}
+
 group("closure_compile") {
   deps = [
     ":cr_elements_resources",
@@ -432,10 +453,10 @@
   js_files = [
     "cr_nav_menu_item_style.ts",
     "cr_page_host_style_css.js",
-    "mwb_shared_icons.js",
-    "mwb_element_shared_style.js",
-    "mwb_shared_style.js",
-    "mwb_shared_vars.js",
-    "search_highlight_style_css.js",
+    "mwb_shared_icons.ts",
+    "mwb_element_shared_style.ts",
+    "mwb_shared_style.ts",
+    "mwb_shared_vars.ts",
+    "search_highlight_style_css.ts",
   ]
 }

ui/webui/resources/cr_elements/mwb_element_shared_style.ts

diff --git a/ui/webui/resources/cr_elements/mwb_element_shared_style.js b/ui/webui/resources/cr_elements/mwb_element_shared_style.ts
similarity index 100%
rename from ui/webui/resources/cr_elements/mwb_element_shared_style.js
rename to ui/webui/resources/cr_elements/mwb_element_shared_style.ts

ui/webui/resources/cr_elements/mwb_shared_icons.ts

diff --git a/ui/webui/resources/cr_elements/mwb_shared_icons.js b/ui/webui/resources/cr_elements/mwb_shared_icons.ts
similarity index 100%
rename from ui/webui/resources/cr_elements/mwb_shared_icons.js
rename to ui/webui/resources/cr_elements/mwb_shared_icons.ts

ui/webui/resources/cr_elements/mwb_shared_style.ts

diff --git a/ui/webui/resources/cr_elements/mwb_shared_style.js b/ui/webui/resources/cr_elements/mwb_shared_style.ts
similarity index 100%
rename from ui/webui/resources/cr_elements/mwb_shared_style.js
rename to ui/webui/resources/cr_elements/mwb_shared_style.ts

ui/webui/resources/cr_elements/mwb_shared_vars.ts

diff --git a/ui/webui/resources/cr_elements/mwb_shared_vars.js b/ui/webui/resources/cr_elements/mwb_shared_vars.ts
similarity index 100%
rename from ui/webui/resources/cr_elements/mwb_shared_vars.js
rename to ui/webui/resources/cr_elements/mwb_shared_vars.ts

ui/webui/resources/cr_elements/search_highlight_style_css.ts

diff --git a/ui/webui/resources/cr_elements/search_highlight_style_css.js b/ui/webui/resources/cr_elements/search_highlight_style_css.ts
similarity index 100%
rename from ui/webui/resources/cr_elements/search_highlight_style_css.js
rename to ui/webui/resources/cr_elements/search_highlight_style_css.ts

ui/webui/resources/js/BUILD.gn

diff --git a/ui/webui/resources/js/BUILD.gn b/ui/webui/resources/js/BUILD.gn
index fdcdefd..aa214b8 100644
--- a/ui/webui/resources/js/BUILD.gn
+++ b/ui/webui/resources/js/BUILD.gn
@@ -41,6 +41,8 @@
   }
 }
 
+# TS files are passed to a separate target so that they are not listed in the
+# |out_manifest|.
 preprocess_if_expr("preprocess_src_ts") {
   in_folder = "./"
   out_folder = "$preprocess_folder"